]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'samual/fixes_for_latest_merge' of ssh://git.xonotic.org/xonotic-data...
authorSamual <samual@xonotic.org>
Mon, 14 Mar 2011 22:17:40 +0000 (18:17 -0400)
committerSamual <samual@xonotic.org>
Mon, 14 Mar 2011 22:17:40 +0000 (18:17 -0400)
commit54bd5bd1ddcb48407ed878b05ccc67941c54adac
treebc24d4c9e2f112646a4840ce9ae5c2815ad97c65
parenta235728c5084648d4b0ef017f19a6b2b43759d37
parentc9a4e7c069bff271841fadecb490aa0b03bf22e0
Merge branch 'samual/fixes_for_latest_merge' of ssh://git.xonotic.org/xonotic-data.pk3dir into samual/fixes_for_latest_merge