Merge branch 'master' into lpcm_encoder

[vlc] / .gitignore

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