]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge commit 'origin/parasti/uncrlf' into divVerent/bastet
authorRudolf Polzer <divverent@alientrap.org>
Fri, 16 Apr 2010 17:00:22 +0000 (19:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 16 Apr 2010 17:00:22 +0000 (19:00 +0200)
commit0edf1092fa38a3a8d8a882f7d6388473ae3e2a66
tree89a7691897396b01bf2bd9833554efe617a82269
parentce3d97c573d033face9dcbc10bcab0885fa8b3e8
parentf9c90da63d3ef7a7b5230aefecc7d7ecfb66c967
Merge commit 'origin/parasti/uncrlf' into divVerent/bastet