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
..
bitmaps	Merge remote-tracking branch 'ttimo/master'	2012-04-12 15:32:57 +02:00