projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a9f8e4f
fb0c942
)
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
author
cbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 17:17:07 +0000
(18:17 +0100)
committer
cbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 17:17:07 +0000
(18:17 +0100)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff