Merge remote-tracking branch 'ttimo/master'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 12 Apr 2012 13:32:57 +0000 (15:32 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 12 Apr 2012 13:32:57 +0000 (15:32 +0200)
commit62d99f889c0e98be65f779d3983109c84ce58cec
treeea00904fff78e84da4abd38d69480a7ebe878493
parent54a001001813df3c27c2b2369ce2ce23d2d39d6a
parentea08af07fef3915c248ef8812723519606cd5887
Merge remote-tracking branch 'ttimo/master'

Conflicts:
plugins/imagepng/plugin.cpp
radiant/gtkdlgs.cpp
radiant/radiant.ico
tools/quake3/q3map2/image.c
plugins/imagepng/plugin.cpp
tools/quake3/q3map2/image.c