]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/universal_reload_system
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 22 Jan 2011 12:32:58 +0000 (14:32 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 22 Jan 2011 12:32:58 +0000 (14:32 +0200)
commitd499d939ae90734c284c85058612aebbd0e5f273
treeee986a2f02565e79c35c45656440d46cd79bb54e
parent4ddfd8e93db725ad6fd209de7d9b0a8054e18dda
parentc53d33ac8f2c46d41b4e7fb8064df7e02e8622f7
Merge branch 'master' into mirceakitsune/universal_reload_system