]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f8783cf ddb71d3)
Merge remote branch 'refs/remotes/origin/mirceakitsune/campingrifle_slot_change'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 29 Oct 2010 15:27:04 +0000 (17:27 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 29 Oct 2010 15:27:04 +0000 (17:27 +0200)

Trivial merge