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
..
imagepng.def	misc project file fixes from trunk (e.g. rev 345). fixes the 'missing MSVCR90.DLL' absurdity	2010-12-24 19:04:32 +00:00
plugin.cpp	Merge remote-tracking branch 'ttimo/master'	2012-04-12 15:32:57 +02:00
plugin.h	my own uncrustify run	2012-03-27 12:03:21 +02:00