projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c62f7a
409ea26
)
Merge remote branch 'origin/master' into samual/balance
author
Samual <samual@xonotic.org>
Wed, 26 Oct 2011 14:27:03 +0000
(10:27 -0400)
committer
Samual <samual@xonotic.org>
Wed, 26 Oct 2011 14:27:03 +0000
(10:27 -0400)
1
2
qcsrc/client/autocvars.qh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/client/autocvars.qh
Simple merge