Rudolf Polzer dac8329952 Merge branch 'master' into divVerent/farplanedist-sky-fix ... Conflicts: tools/quake3/q3map2/prtfile.c tools/quake3/q3map2/vis.c tools/quake3/q3map2/visflow.c		2012-05-15 11:58:06 +02:00
..
quake2	Merge remote-tracking branch 'ttimo/master'	2012-04-12 15:32:57 +02:00
quake3	Merge branch 'master' into divVerent/farplanedist-sky-fix	2012-05-15 11:58:06 +02:00