Merge branch 'master' into matthiaskrgr/unsealed

author Matthias Krüger <matthias.krueger@famsik.de>

Mon, 7 Sep 2015 02:06:54 +0000 (04:06 +0200)

committer Matthias Krüger <matthias.krueger@famsik.de>

Mon, 7 Sep 2015 02:06:54 +0000 (04:06 +0200)
author Matthias Krüger <matthias.krueger@famsik.de>
Mon, 7 Sep 2015 02:06:54 +0000 (04:06 +0200)
committer Matthias Krüger <matthias.krueger@famsik.de>
Mon, 7 Sep 2015 02:06:54 +0000 (04:06 +0200)
diff --cc scripts/shaderlist.txt

index 237d15fbbbedf294064434ae5a7d74349a76c558,1ab8c0ece645d29ec903330dd0fcb29556405552..5e936615d36c2fcb2105d107ef9c98b5502998ed
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -33,7 -33,7 +34,8 @@@ map_solariu
   map_space-elevator
   map_stormkeep
   map_techassault
+ +map_unsealedtrial3
+ map_warfare
   map_xoylent
   metaltechx
   model_bigfan01
diff --cc scripts/trak5x.shader
Simple merge
author	Matthias Krüger <matthias.krueger@famsik.de>
	Mon, 7 Sep 2015 02:06:54 +0000 (04:06 +0200)
committer	Matthias Krüger <matthias.krueger@famsik.de>
	Mon, 7 Sep 2015 02:06:54 +0000 (04:06 +0200)
		1	2
scripts/shaderlist.txt	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/trak5x.shader	patch \|	diff1 \|	diff2 \|	blob \| history