From 3afa9ac77d1b69e2aef199f876610edd6600f09c Mon Sep 17 00:00:00 2001 From: Alexandre Lision <alexandre.lision@savoirfairelinux.com> Date: Tue, 1 Oct 2013 14:40:34 -0400 Subject: [PATCH] gitignore: keep *.keystore untracked --- .gitignore | 3 ++- .gitignore~ | 27 --------------------------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 .gitignore~ diff --git a/.gitignore b/.gitignore index ddd5bba50..71c616ea6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,8 @@ ID .settings/org.eclipse.jdt.ui.prefs local.properties - +ant.properties +*.keystore SFLPhoneservice* CallManager.java CallManagerCallback.java diff --git a/.gitignore~ b/.gitignore~ deleted file mode 100644 index 9efdbca56..000000000 --- a/.gitignore~ +++ /dev/null @@ -1,27 +0,0 @@ -/jni/libcutils -/obj -/libs -/bin -/gen -*.swp -tags -TAGS.LST -ID - - -.classpath -.project -.settings/org.eclipse.jdt.core.prefs -.settings/org.eclipse.jdt.ui.prefs -local.properties - - -SFLPhoneservice* -CallManagerJNI.java -Callback.java -ConfigurationCallback.java -ManagerImpl.java -SWIGTYPE* -StringMap.java -StringVect.java - -- GitLab