]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into nifrek/duckanims
authornifrek <nifrek@gmail.com>
Tue, 20 Dec 2011 05:05:50 +0000 (00:05 -0500)
committernifrek <nifrek@gmail.com>
Tue, 20 Dec 2011 05:05:50 +0000 (00:05 -0500)
commit74511aee30c0470380c6f99a472028465c3caf80
treed90618160587807eb15515e2a06aec76987151b5
parent1f1899e11a37bcc1fdfd4dbc1f277a571a4beebe
parent12ffb9798ae456940accc88fa00d0f29beaa8413
Merge remote-tracking branch 'origin/master' into nifrek/duckanims