]> git.xonotic.org Git - xonotic/netradiant.git/commit
Merge branch 'master' into divVerent/cutAtDash divVerent/cutAtDash
authorRudolf Polzer <divverent@xonotic.org>
Tue, 15 May 2012 09:52:19 +0000 (11:52 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 15 May 2012 09:52:31 +0000 (11:52 +0200)
commite2362eed53d1b630f844401293e9f2872f09d3a6
treecfb4fce5347a1000843ddf09bdf670ad254694fc
parenta3453011c1ae2b6363707862755a4fa0bd5cd4dd
parent7fc621fc78d0e040dc2c12f38dc53dd9048215dc
Merge branch 'master' into divVerent/cutAtDash

Conflicts:
radiant/texwindow.cpp