Merge in xonotic/mediasource.git: mirceakitsune/mutator_relics
git-manager created issue #434 on 2011-05-01T14:37:47Z:
Purpose of the branch:
Since the relics media is in master, this should be merged too.
Repository: xonotic/mediasource.git Commit: 752b344b Branch: mirceakitsune/mutator_relics
Merge commands:
cd mediasource
git checkout master
git reset --hard origin/master
git pull && git diff '752b344bde90f436e366944c429f71b06eef60a1'..'origin/mirceakitsune/mutator_relics'
# 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/mirceakitsune/mutator_relics'
# 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 'mirceakitsune/mutator_relics'
Diffstat:
models/relics.zip | Bin 0 -> 1288827 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
Revision log:
commit 752b344bde90f436e366944c429f71b06eef60a1
Author: MirceaKitsune
Commit: MirceaKitsune
Symbol sources for the relic models
User agreed to the GPLv2+.
Diff:
diff --git a/models/relics.zip b/models/relics.zip
new file mode 100644
index 0000000..f1ccd01
Binary files /dev/null and b/models/relics.zip differ