projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2cbe50a
e16d25d
)
Merge branch 'master' into terencehill/tooltips_cleanup
230/head
author
terencehill <piuntn@gmail.com>
Tue, 13 Oct 2015 22:41:50 +0000
(
00:41
+0200)
committer
terencehill <piuntn@gmail.com>
Tue, 13 Oct 2015 22:41:50 +0000
(
00:41
+0200)
1
2
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
Simple merge