projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into tizen
[platform/upstream/iotivity.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
12b1d25
..
eadac8f
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-60,6
+60,8
@@
service/things-manager/sdk/build/linux/
# Ignore Eclipse workspace files
*.settings/
# Ignore Eclipse workspace files
*.settings/
+*.cproject
+*.project
# Ignore proguard file generated by Eclipse
proguard-project.txt
# Ignore proguard file generated by Eclipse
proguard-project.txt
@@
-90,11
+92,13
@@
extlibs/gtest/gtest-*
extlibs/hippomocks-master/
extlibs/master.zip
extlibs/cereal/cereal
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
extlibs/android/sdk/android-sdk_r24.2
extlibs/cereal
extlibs/android/gradle/gradle-2.2.1
extlibs/android/ndk/android-ndk-r10d
extlibs/android/sdk/android-sdk_r24.2
+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
*.tgz
extlibs/boost/boost_1_58_0
#extlibs/tinycbor/tinycbor
*.tgz
@@
-103,6
+107,7
@@
extlibs/arduino/arduino-1.5.8
build_common/arduino/extlibs/arduino/arduino-1.5.8
extlibs/tinydtls/dtls-client
extlibs/tinydtls/dtls-server
build_common/arduino/extlibs/arduino/arduino-1.5.8
extlibs/tinydtls/dtls-client
extlibs/tinydtls/dtls-server
+extlibs/bluez/bluez
# Ignore editor (e.g. Emacs) backup and autosave files
*~
# Ignore editor (e.g. Emacs) backup and autosave files
*~