]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into Mario/buffs
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:10:16 +0000 (22:10 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:10:16 +0000 (22:10 +1100)
commit71775fe6ad624b08f0aad2b7116c48f35198478c
tree754fd5873ff335d820c457160a149cc86de4ffd2
parent33c60c506532615dba6ce30c3c64ac2fe8b934c0
parent56389901187f16f174129343aef2797a89788073
Merge remote-tracking branch 'origin/master' into Mario/buffs
18 files changed:
.DS_Store
gfx/.DS_Store
gfx/hud/.DS_Store
models/.DS_Store
models/player/.DS_Store
models/weapons/.DS_Store
qcsrc/.DS_Store
qcsrc/client/.DS_Store
qcsrc/client/progs.src
qcsrc/common/.DS_Store
qcsrc/common/stats.qh
qcsrc/common/weapons/.DS_Store
qcsrc/menu/.DS_Store
qcsrc/menu/xonotic/.DS_Store
qcsrc/server/.DS_Store
qcsrc/server/progs.src
scripts/.DS_Store
textures/.DS_Store