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
f132748
..
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
@@
-98,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/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
*.tgz
*.zip
extlibs/arduino/arduino-1.5.8