Merge branch 'master' into lpcm_encoder

[vlc] / .gitignore

diff --git a/.gitignore b/.gitignore
index ae8d4a135feeeb054777504f8d5f143dadcaa846..2ba7644aa1409b94fdb184ee265acc1f6cb697c5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@
 *.pc
 *.vlt
 *.class
+*.dmg
+.DS_Store
 .deps
 .libs
 .dirstamp
@@ -34,18 +36,20 @@ rvlc
 svlc
 cvlc
 qvlc
+mvlc
 nvlc
 wxvlc
-vlc
 vlc_install_dir/*
+plugins-*.dat
 
 # Ignore CMake Stuff
 cmake
 CMakeFiles
-CMakeLists.txt
 CTestTestfile.cmake
 cmake_install.cmake
 cmake_uninstall.cmake
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
+
+/include/vlc/libvlc_version.h