Merge branch 'master' into lpcm_encoder

[vlc] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8b8b985ed5f0bbe3bd74cdcc63ac24e8d24e1200..2ba7644aa1409b94fdb184ee265acc1f6cb697c5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -39,8 +39,8 @@ qvlc
 mvlc
 nvlc
 wxvlc
-vlc
 vlc_install_dir/*
+plugins-*.dat
 
 # Ignore CMake Stuff
 cmake
@@ -51,3 +51,5 @@ cmake_uninstall.cmake
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
+
+/include/vlc/libvlc_version.h