projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
087948d
e096344
)
Merge branch 'DefaultUser/gametype_votescreen' into 'master'
author
Mario <zacjardine@y7mail.com>
Thu, 1 Sep 2016 11:10:05 +0000
(11:10 +0000)
committer
Mario <zacjardine@y7mail.com>
Thu, 1 Sep 2016 11:10:05 +0000
(11:10 +0000)
Gametype Votescreen: Fix icons for custom gamemodes and add option for custom icons
See merge request !359
1
2
qcsrc/client/mapvoting.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/client/mapvoting.qc
Simple merge