Merge branch 'master' into lpcm_encoder

[vlc] / .gitignore

diff --git a/.gitignore b/.gitignore
index a9e4343ba25e468b4906e74bc32a51396a7981c9..2ba7644aa1409b94fdb184ee265acc1f6cb697c5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,30 @@
 *~
+*.app
 *.cache
+*.dylib
 *.lo
+*.lo?
 *.la
-*.m4
 *.mak
 *.moc.cpp
 *.o
+*.so
+*.pc
 *.vlt
+*.class
+*.dmg
+.DS_Store
 .deps
 .libs
 .dirstamp
 ABOUT-NLS
 aclocal.m4
-autotools
 compile
-config.*
+config.status
+config.h*
+config.log
 configure
+INSTALL.git
 libtool
 Makefile
 Makefile.in
@@ -27,4 +36,20 @@ rvlc
 svlc
 cvlc
 qvlc
-vlc
+mvlc
+nvlc
+wxvlc
+vlc_install_dir/*
+plugins-*.dat
+
+# Ignore CMake Stuff
+cmake
+CMakeFiles
+CTestTestfile.cmake
+cmake_install.cmake
+cmake_uninstall.cmake
+CMakeCache.txt
+CPackConfig.cmake
+CPackSourceConfig.cmake
+
+/include/vlc/libvlc_version.h