Merge branch 'master' into lpcm_encoder

[vlc] / .gitignore

diff --git a/.gitignore b/.gitignore
index 65569c473a5db0f7aab079cab794b82c55693fb7..2ba7644aa1409b94fdb184ee265acc1f6cb697c5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -36,19 +36,20 @@ rvlc
 svlc
 cvlc
 qvlc
+mvlc
 nvlc
 wxvlc
-vlc
 vlc_install_dir/*
-intl
+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