restore .gitignore at the good place.

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..1473464
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,34 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+intltool-extract
+intltool-merge
+intltool-update
+libtool
+ltmain.sh
+missing
+mkinstalldirs
+speex
+stamp-h1
+linphone.spec
+linphone.iss
+msx264.iss
+*.o
+*.exe
+*.zip
+*~
+linphone-install
+buddylookup-install
+msx264-install
+

diff --git a/linphone/.gitignore b/linphone/.gitignore
deleted file mode 100644 (file)
index 1473464..0000000
--- a/linphone/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-intltool-extract
-intltool-merge
-intltool-update
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-speex
-stamp-h1
-linphone.spec
-linphone.iss
-msx264.iss
-*.o
-*.exe
-*.zip
-*~
-linphone-install
-buddylookup-install
-msx264-install
-