1 files changed, 30 insertions, 26 deletions

diff --git a/.gitignore b/.gitignore
index fa279f90..c27c7a6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,21 +26,26 @@
 # Compiled MATLAB
 *.mex*
 
-# build, distribute, and bins
-build
-.build_debug/*
-.build_release/*
-distribute/*
-*.testbin
-*.bin
-python/caffe/proto/
+# IPython notebook checkpoints
+.ipynb_checkpoints
+
+# CMake generated files
+*.gen.cmake
 
 # Editor temporaries
 *.swp
 *~
 
-# IPython notebook checkpoints
-.ipynb_checkpoints
+# Sublime Text settings
+*.sublime-workspace
+*.sublime-project
+
+# Eclipse Project settings
+*.*project
+.settings
+
+# OSX dir files
+.DS_Store
 
 ## Caffe
 
@@ -58,13 +63,14 @@ models/*
 *leveldb
 *lmdb
 
-# LevelDB files
-*.sst
-*.ldb
-LOCK
-LOG*
-CURRENT
-MANIFEST-*
+# build, distribute, and bins (+ python proto bindings)
+build
+.build_debug/*
+.build_release/*
+distribute/*
+*.testbin
+*.bin
+python/caffe/proto/
 
 # Generated documentation
 docs/_site
@@ -73,12 +79,10 @@ _site
 doxygen
 docs/dev
 
-# Sublime Text settings
-*.sublime-workspace
-*.sublime-project
-
-# Eclipse Project settings
-*.*project
-
-# CMake generated files
-*.gen.cmake
+# LevelDB files
+*.sst
+*.ldb
+LOCK
+LOG*
+CURRENT
+MANIFEST-*