Rudolf Polzer 62d99f889c Merge remote-tracking branch 'ttimo/master' ... Conflicts: plugins/imagepng/plugin.cpp radiant/gtkdlgs.cpp radiant/radiant.ico tools/quake3/q3map2/image.c		2012-04-12 15:32:57 +02:00
..
common	my own uncrustify run	2012-03-27 12:03:21 +02:00
extra	Q2Tools source - didn't import this in initially	2012-04-07 18:53:01 -05:00
q2map	my own uncrustify run	2012-03-27 12:03:21 +02:00
qdata	my own uncrustify run	2012-03-27 12:03:21 +02:00
qdata_heretic2	my own uncrustify run	2012-03-27 12:03:21 +02:00