]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a345301 7fc621f)
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)
Conflicts:
radiant/texwindow.cpp


Trivial merge