]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 73c5be6 f119376)
Merge branch 'master' of ssh://icculus.org/netradiant
authorjal <germangar@gmail.com>
Fri, 28 May 2010 19:51:30 +0000 (21:51 +0200)
committerjal <germangar@gmail.com>
Fri, 28 May 2010 19:51:30 +0000 (21:51 +0200)

Trivial merge