Remove OC_REST_CANCEL_OBSERVE from OCMethod.

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

diff --git a/.gitignore b/.gitignore
index 7d0ce16..03d48b2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,9 @@ resource/csdk/stack/samples/linux/SimpleClientServer/release/
 
 resource/csdk/connectivity/build/out/
 
+# Ignore autogenerated files
+resource/c_common/iotivity_config.h
+
 resource/oc_logger/bin/
 resource/oc_logger/lib/
 resource/oc_logger/samples/linux/release/
@@ -49,6 +52,11 @@ service/things-manager/build/linux/release
 service/things-manager/build/linux/debug
 service/things-manager/sdk/build/linux/
 
+service/notification/android/.gradle/
+service/notification/android/build/
+service/notification/android/notification-service/build/
+service/notification/android/notification-service/src/main/obj/
+
 # Ignore any object files
 *.o
 *.os
@@ -84,8 +92,10 @@ config.log
 os
 out/
 platform
+iotivity.pc
 
 # Ignore downloaded dependencies
+extlibs/libcoap/libcoap
 extlibs/gtest/gtest-*
 extlibs/hippomocks-master/
 extlibs/master.zip
@@ -111,6 +121,9 @@ extlibs/bluez/bluez
 *~
 *#*#
 *.orig
+.cproject
+.gradle/
+.project
 
 # Ignore byte-compiled Python scripts
 *.pyc