]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3di...
authorSamual Lenks <samual@xonotic.org>
Sat, 29 Jun 2013 21:40:10 +0000 (17:40 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 29 Jun 2013 21:40:10 +0000 (17:40 -0400)
commit439c208fa27d97bafd21330d149280ff2f989cba
tree82bbfd5d332b7094a8cb1154b172f57c37e6bc83
parent6c6c3e75dda010c83c9a27ecaf3fc21fd4f88be0
parent87845e25a967ee91a6b6645cc55eb3e5fcca64f1
Merge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into samual/weapons