Merge remote-tracking branch 'origin/matthiaskrgr/scrnshot_ents'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:16:56 +0000 (11:16 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:16:56 +0000 (11:16 +0200)
commit0f116ce0dad0774b06f192bad8a3bf36d670c769
tree5563cadaa96644c01f27448ea9570f82e240a65c
parent4e2a9eb4aad5152e3197d9e538c59a2c7b5be625
parentf431dfed2f1db18a2ed4f371899d5fed793fc352
Merge remote-tracking branch 'origin/matthiaskrgr/scrnshot_ents'