Merge branch 'gstreamer' into develop

Conflicts:
	.gitignore
	Vocaluxe/Vocaluxe.csproj
This commit is contained in:
Flamefire committed 2013-03-15 14:57:17 +01:00
commit 8b70a42e09
6 files changed
+18 -24

No files matched your search

+3 -16
View File
@@ -3,36 +3,21 @@ Output/Songs
*.mp4
*.pdb
/Output/Benchmark.log
/Output/CoverDB.sqlite
/Output/HighscoreDB.sqlite
/Output/PartyModes/*/Code/*
/Output/Vocaluxe.exe*
/Output/Vocaluxe.vshost.exe*
/Output/VocaluxeLib.dll
*.psess
/*.vsp
/*.ctl
/Output/Registration.xml
/Vocaluxe.suo
/Vocaluxe/Vocaluxe.csproj.user
/Output/Config.xml
*.ipch
*.log
/Output/Playlists/*.xml
/Output/x64/gstreamer/GstreamerHelper.dll
*.tlog
@@ -42,8 +27,10 @@ Output/Songs
*.pch
*.idb
*.exp
*.ilk
*.lib
*.opensdf
*.sdf
*.codeanalysis*
*.nativecodeanalysis*
*.lastcodeanalysissucceeded