]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'samual/combined_updates' of http://nl.git.xonotic.org/xonotic/xonotic...
authorMario <mario.mario@y7mail.com>
Sat, 21 Dec 2013 01:04:24 +0000 (12:04 +1100)
committerMario <mario.mario@y7mail.com>
Sat, 21 Dec 2013 01:04:24 +0000 (12:04 +1100)
commitb0303d8abfca5fb7775abc83a418f06740035032
treef97753ee0f73da6927e5d21111e7af06c5b1db9b
parent39e39ee597b9e98f9cb6d423644575dc3176b7e3
parent7931d63fcb1042b4ff75fd6b7d46eb25efcdca25
Merge branch 'samual/combined_updates' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into samual/combined_updates