projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
63fc798
0d2d14e
)
Merge remote-tracking branch 'origin/samual/cortez-darkzone-updates'
author
Samual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:33:19 +0000
(23:33 -0400)
committer
Samual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:33:19 +0000
(23:33 -0400)
Conflicts:
maps/darkzone.map
maps/darkzone.map.options
1
2
maps/darkzone.map
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
maps/darkzone.map
Simple merge