Merge in xonotic/xonotic-maps.pk3dir.git: matthiaskrgr/shaderlist_upd
git-manager created issue #1702 on 2013-06-23T13:50:22Z:
Purpose of the branch:
unfortunately, the shader list is not updated when a shader is removed.
Repository: xonotic/xonotic-maps.pk3dir.git Commit: 4180628f17705bc8567fb0b21e5d0810a231c99b Branch: matthiaskrgr/shaderlist_upd
Merge commands:
cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '4180628f17705bc8567fb0b21e5d0810a231c99b'..'origin/matthiaskrgr/shaderlist_upd'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --no-ff 'origin/matthiaskrgr/shaderlist_upd'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'matthiaskrgr/shaderlist_upd'
Diffstat:
scripts/Makefile | 2 +-
scripts/shaderlist.txt | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
Revision log:
commit 4180628f17705bc8567fb0b21e5d0810a231c99b
Author: Matthias Krüger
Commit: Matthias Krüger
shaderlist: add map_oilrig.
commit e30c39c5585132e37256ac19543a64f6af9f6a23
Author: Matthias Krüger
Commit: Matthias Krüger
make: update shaderlists.txt as soon as a *.shader file is changed.
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/scripts/Makefile b/scripts/Makefile
index a4bfcef..0ce6fe1 100644
— a/scripts/Makefile
**+ b/scripts/Makefile
@ -9,5 +9,5
@ all: shaderlist.txt \$
clean:
\$ “\$(GENERATEDFILES)”
-shaderlist.txt:
*shaderlist.txt: *.shader
ls 1 *.shader | cutd . ~~f 1 > "\$" diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt index ce08e64..fd5f8f5 100644 --- a/scripts/shaderlist.txt +++ b/scripts/shaderlist.txt
@~~24,6 *24,7 @@ map\_glowplant
map\_leave\_em\_behind
map\_lightspeed
map\_newtonian-nightmare
*map\_oilrig
map\_red-planet
map\_silentsiege
map\_solarium