diff --git a/.gitignore b/.gitignore
index fa279f9071b7d6e0823713226b7483ff1082a318..ffdcf120117ae9ab57f8f1c50508342bbe92f703 100644 (file)
--- a/.gitignore
+++ b/.gitignore
# Compiled MATLAB
*.mex*
-# build, distribute, and bins
-build
-.build_debug/*
-.build_release/*
-distribute/*
-*.testbin
-*.bin
-python/caffe/proto/
+# IPython notebook checkpoints
+.ipynb_checkpoints
# Editor temporaries
*.swp
*~
-# IPython notebook checkpoints
-.ipynb_checkpoints
+# Sublime Text settings
+*.sublime-workspace
+*.sublime-project
+
+# Eclipse Project settings
+*.*project
+.settings
+
+# QtCreator files
+*.user
+
+# PyCharm files
+.idea
+
+# OSX dir files
+.DS_Store
## Caffe
# User's build configuration
-Makefile.config
+#Makefile.config
# Data and models are either
# 1. reference, and not casually committed
data/*
models/*
*.caffemodel
+*.caffemodel.h5
*.solverstate
+*.solverstate.h5
*.binaryproto
*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/
+cmake_build
+.cmake_build
# Generated documentation
docs/_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-*