projects
/
xonotic
/
gmqcc.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9b92cb0
78b615f
)
Merge branch 'master' into cooking
author
Dale Weiler <killfieldengine@gmail.com>
Sat, 30 Nov 2013 18:14:04 +0000
(13:14 -0500)
committer
Dale Weiler <killfieldengine@gmail.com>
Sat, 30 Nov 2013 18:14:04 +0000
(13:14 -0500)
1
2
util.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
util.c
Simple merge