Merge branch 'mediasource/m0rfar/SkySources' of git://git.xonotic.org/xonotic/oldstuff
authorRudolf Polzer <divverent@xonotic.org>
Sun, 19 Feb 2012 15:31:25 +0000 (16:31 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 19 Feb 2012 15:31:25 +0000 (16:31 +0100)
commitd9cef73bd8e2f73fc41d71e49a3461fafb68ce15
tree88c910ad1caed79f71a0433376d4a7f32ac3bd33
parentdc7da23fe5ffcee05b12ace5f83d5a3c5a4095bd
parent0de5174e08e1478533e0231f840de8314d83c765
Merge branch 'mediasource/m0rfar/SkySources' of git://git.xonotic.org/xonotic/oldstuff