]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/terencehill/screenshot_viewer' into samual/combi...
authorSamual Lenks <samual@xonotic.org>
Sun, 18 Aug 2013 18:54:32 +0000 (14:54 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 18 Aug 2013 18:54:32 +0000 (14:54 -0400)
commit4573326ce5d9a936956984ccaa5d7fe1b41f0013
tree8f87e2c62f911b5c6ba4dadfbaae731de734f692
parented00b093ac5b81fe120a286de0756b1b2549dc39
parentda748c2badc119ef4e608265b92de867f2f97f42
Merge remote-tracking branch 'origin/terencehill/screenshot_viewer' into samual/combined_updates