Merge remote-tracking branch 'origin/matthiaskrgr/glassx'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:18:25 +0000 (11:18 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:18:25 +0000 (11:18 +0200)
commit3e96423ad45ba9dea75b5a4ffdfbb681b4bee9d1
treeaaff6a4700369d8ce0dff00ed0f67e4118ebe1b4
parentcb9cceaf036dd39842f4fafdbdfb5393bb28c022
parent0d41a7e6fef60db508cc031c168766a8ede50317
Merge remote-tracking branch 'origin/matthiaskrgr/glassx'