]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/divVerent/weapons-field-rewrite'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 2 Apr 2012 06:49:53 +0000 (08:49 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 2 Apr 2012 06:49:53 +0000 (08:49 +0200)
commit14401d27dcc6eeb85c80331c242dcbb3e1d977d7
treea3cafff09a75ab8ce064468c7dba5f6fd2c74dbc
parent5971450f60ad09893779e334d5b977e3cc4f374b
parent29efd043b77ad77d85789407e8dfaf25ad50e2a8
Merge remote-tracking branch 'origin/divVerent/weapons-field-rewrite'