]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4499fdf 277e4ae)
Merge remote branch 'origin/m0rfar/heaven'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 23:02:18 +0000 (01:02 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 23:02:18 +0000 (01:02 +0200)

Trivial merge