Merge remote-tracking branch 'ttimo/master'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 7 May 2012 10:32:21 +0000 (12:32 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 7 May 2012 10:32:31 +0000 (12:32 +0200)
commit7fc621fc78d0e040dc2c12f38dc53dd9048215dc
tree53be399354c9a3cf390ef5561186df9ce8e66064
parent0bbb58dd9cc75dc34d2bdba9f12679f6fd9f9ce5
parent9b5ba1fe10d7eba4db1588c2a4926829c465dc76
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
tools/quake3/common/cmdlib.c
tools/quake3/common/cmdlib.h
tools/quake3/common/unzip.c
tools/quake3/q3map2/image.c