]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Fri, 3 Dec 2010 14:02:29 +0000 (09:02 -0500)
committerunknown <samual@xonotic.org>
Fri, 3 Dec 2010 14:02:29 +0000 (09:02 -0500)
commitf15fdd04feb2eba35cd75f5da19b50a50379ec64
tree23bde4e53823ca553e8f20e4ca1cc6c77ac08a0f
parentc69cad4c9a0cfc66099eda8c344028212d524016
parentee6e2d1de97777a4fdfdb750f412a12dce2178d7
Merge remote branch 'origin/master' into samual/keepaway
defaultXonotic.cfg