Merge branch 'master' into lpcm_encoder

[vlc] / .gitignore

diff --git a/.gitignore b/.gitignore
index 767c3dba44b57bf9edfb24fddb774cccca047959..2ba7644aa1409b94fdb184ee265acc1f6cb697c5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,55 @@
 *~
+*.app
 *.cache
+*.dylib
 *.lo
+*.lo?
 *.la
+*.mak
+*.moc.cpp
+*.o
+*.so
+*.pc
+*.vlt
+*.class
+*.dmg
+.DS_Store
 .deps
 .libs
+.dirstamp
 ABOUT-NLS
 aclocal.m4
-autotools
-config.*
+compile
+config.status
+config.h*
+config.log
 configure
+INSTALL.git
+libtool
+Makefile
 Makefile.in
+stamp-*
+vlc-config
+vlc-config.in
+qvlc
+rvlc
+svlc
+cvlc
+qvlc
+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