]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - gfx/menu/luminos/skinvalues.txt
Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sun, 13 Oct 2013 03:11:39 +0000 (23:11 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 13 Oct 2013 03:11:39 +0000 (23:11 -0400)
commitcd1ccb7c3ac08760ccc361d6c863fcc2ade4ac2e
treeb266d23fc828070c2ef3d31b5488fbe5d06daa67
parent5c4ae3ec7458cf4e8d07f6eed4fe24fceea13b70
parentd78465c6c312c59742e0222f19a718969c0b1a99
Merge remote-tracking branch 'origin/master' into samual/combined_updates