Rudolf Polzer 7fc621fc78 Merge remote-tracking branch 'ttimo/master' ... Conflicts: config.py libs/missing.h plugins/model/cpicosurface.cpp plugins/vfspk3/unzip.cpp radiant/main.cpp radiant/mainframe.cpp radiant/mainframe.h radiant/missing.cpp radiant/pluginmanager.cpp radiant/preferences.cpp radiant/preferences.h tools/quake3/common/cmdlib.c tools/quake3/common/unzip.c tools/quake3/q3map2/image.c		2012-05-07 12:32:31 +02:00
..
quake2	Merge remote-tracking branch 'ttimo/master'	2012-04-12 15:32:57 +02:00
quake3	Merge remote-tracking branch 'ttimo/master'	2012-05-07 12:32:31 +02:00