Modify android sample app

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

diff --git a/.gitignore b/.gitignore
index d0fbb21..291fb19 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,9 @@ service/things-manager/sdk/build/linux/
 # Ignore Eclipse workspace files
 *.settings/
 
+# Ignore proguard file generated by Eclipse
+proguard-project.txt
+
 # Ignore CTags default data
 tags
 # Ignore dependencies folder, which should be generated
@@ -94,6 +97,7 @@ build_common/arduino/extlibs/arduino/arduino-1.5.8
 # Ignore editor (e.g. Emacs) backup and autosave files
 *~
 *#*#
+*.orig
 
 # Ignore byte-compiled Python scripts
 *.pyc