Merge branch 'upstream' into tizen

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

diff --git a/.gitignore b/.gitignore
index bd1b459..eadac8f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,8 @@ service/things-manager/sdk/build/linux/
 
 # Ignore Eclipse workspace files
 *.settings/
+*.cproject
+*.project
 
 # Ignore proguard file generated by Eclipse
 proguard-project.txt
@@ -90,7 +92,6 @@ extlibs/gtest/gtest-*
 extlibs/hippomocks-master/
 extlibs/master.zip
 extlibs/cereal/cereal
-extlibs/expat/expat*
 extlibs/cereal
 extlibs/android/gradle/gradle-2.2.1
 extlibs/android/ndk/android-ndk-r10d
@@ -99,7 +100,7 @@ extlibs/android/sdk/android-sdk-linux
 extlibs/android/sdk/android-sdk-macosx
 extlibs/android/sdk/android-sdk-windows
 extlibs/boost/boost_1_58_0
-extlibs/tinycbor/tinycbor
+#extlibs/tinycbor/tinycbor
 *.tgz
 *.zip
 extlibs/arduino/arduino-1.5.8