summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpepperpepperpepper <pepper@scannerjammer.com>2015-12-07 19:31:36 -0800
committerpepperpepperpepper <pepper@scannerjammer.com>2015-12-07 19:31:36 -0800
commitb08d2f2cadd971b2a66defe2fc24e6c5c455dab2 (patch)
treedddc92c987b9273710990f63f146b26da0d3b5cf
parent2948ac74328555d0749a0eecd98bea9c2574eba3 (diff)
parentb81a4e37fb642732bc1020bbc8669f14d8d9e1fc (diff)
Merge branch 'master' of ghghgh.us:photoblaster/photoblaster
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ac0c47c..8a942e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
*.pyc
*.un~
./logs/*
-*.ropeproject
+*.ropeproject*