projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b900494
094efb6
)
Merge remote branch 'origin/master' into diabolik/afterslime
author
ssinghal <dib.diabolik@gmail.com>
Thu, 17 Feb 2011 21:05:11 +0000
(16:05 -0500)
committer
ssinghal <dib.diabolik@gmail.com>
Thu, 17 Feb 2011 21:05:11 +0000
(16:05 -0500)
1
2
scripts/shaderlist.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
scripts/shaderlist.txt
Simple merge