Merge branch 'connectivity-abstraction' to master

[platform/upstream/iotivity.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7c9c8ba..1c4ddab 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,9 @@ resource/oc_logger/lib/
 resource/oc_logger/samples/linux/release/
 resource/oc_logger/samples/linux/debug
 
+resource/unittests/release/
+resource/unittests/debug/
+
 service/things-manager/build/linux/release
 service/things-manager/build/linux/debug
 service/things-manager/sdk/build/linux/
@@ -35,6 +38,8 @@ service/things-manager/sdk/build/linux/
 *.cproject
 *.project
 
+# Ignore CTags default data
+tags
 # Ignore dependencies folder, which should be generated
 dependencies/
 
@@ -54,9 +59,19 @@ platform
 
 # Ignore downloaded dependencies
 extlibs/gtest*
+extlibs/hippomocks-master/
+extlibs/master.zip
+extlibs/cereal/cereal
+extlibs/expat/expat*
 extlibs/cereal
-extlibs/hippomocks-master
 *.tgz
 *.zip
 extlibs/arduino/arduino-1.5.8
 build_common/arduino/extlibs/arduino/arduino-1.5.8
+
+# Ignore editor (e.g. Emacs) backup and autosave files
+*~
+*#*#
+
+# Ignore byte-compiled Python scripts
+*.pyc