summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-04-30 09:05:34 -0500
committerBryan Bishop <kanzure@gmail.com>2012-04-30 09:05:34 -0500
commit859f144c23b0740aad3a22ad5faee85a0eacd526 (patch)
treeaa15726df61ef8ae838bb6919806246180b273aa
parenta269f9723ed50815e5a88a0cf8a1b8db74a1a306 (diff)
downloadnanoengineer-859f144c23b0740aad3a22ad5faee85a0eacd526.tar.gz
nanoengineer-859f144c23b0740aad3a22ad5faee85a0eacd526.zip
.gitignore entries from svn global-ignores
-rw-r--r--.gitignore10
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 9cb41350d..b731298cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,15 @@
# precompiled python files
*.pyc
+*.pyo
-# vim leftovers
+# vim and editor leftovers
.*.swp
.*.swo
+.*~
+*~
+
+# osx leftovers
+.DS_Store
# compiled object files and shared/linked libraries
*.o
@@ -88,3 +94,5 @@ sim/src/version.h
cad/src/atombase.c
cad/src/samevals.c
+*.rej
+.*.rej