X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=.gitignore;h=291fb1959724055bf40338be0597c2afcf98d812;hb=5453db4c0354909f07fdcf407003a8b3494f974a;hp=d0fbb2139436661ed9b32d25b9d6a92cd8c57072;hpb=ad39e6345f07b0c8d9137bb5979580160718f533;p=platform%2Fupstream%2Fiotivity.git

diff --git a/.gitignore b/.gitignore
index d0fbb21..291fb19 100644
--- 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