This is an automated email from the git hooks/post-receive script. arand-guest pushed a commit to branch master in repository redeclipse-data.
commit 29889b3ecbd54dc6db3e8d2a8eb876cfd76c2629 Merge: eafef23 c0a3567 Author: Martin Erik Werner <martinerikwer...@gmail.com> Date: Sat Jun 20 16:25:14 2015 +0200 Merge tag 'upstream/1.5.2+ds1' Upstream version 1.5.2+ds1 # gpg: Signature made Sat 20 Jun 2015 16:25:14 CEST using RSA key ID 481823D1 # gpg: Good signature from "Martin Erik Werner <martinerikwer...@gmail.com>" # gpg: aka "Arand Nash <ienor...@gmail.com>" .gitattributes | 16 + .gitignore | 18 + fonts/akashi-license.txt | 171 +++ fonts/akashi.ttf | Bin 0 -> 17620 bytes maps/absorption.cfg | 2 +- maps/abuse.cfg | 2 +- maps/affluence.cfg | 2 +- maps/ares.cfg | 2 +- maps/battlefield.cfg | 2 +- maps/biolytic.cfg | 2 +- maps/bloodlust.cfg | 2 +- maps/campgrounds.cfg | 2 +- maps/canals.cfg | 2 +- maps/canyon.cfg | 2 +- maps/castle.cfg | 30 +- maps/castle.mpz | Bin 777283 -> 489158 bytes maps/center.mpz | Bin 1070317 -> 1082087 bytes maps/colony.mpz | Bin 1138396 -> 1141490 bytes maps/condensation.cfg | 2 +- maps/conflict.cfg | 2 +- maps/convolution.cfg | 2 +- maps/cutec.cfg | 2 +- maps/darkness.mpz | Bin 1639004 -> 1616916 bytes maps/deathtrap.mpz | Bin 679026 -> 675040 bytes maps/decay.cfg | 2 +- maps/decomposition.cfg | 2 +- maps/deli.mpz | Bin 1604119 -> 1711432 bytes maps/deli.png | Bin 360665 -> 350912 bytes maps/depot.mpz | Bin 888008 -> 893034 bytes maps/enyo.cfg | 2 +- maps/erosion.cfg | 2 +- maps/error.cfg | 16 +- maps/error.mpz | Bin 974107 -> 2050422 bytes maps/error.png | Bin 478868 -> 550964 bytes maps/escape.cfg | 21 - maps/escape.mpz | Bin 504333 -> 472227 bytes maps/escape.png | Bin 494314 -> 374179 bytes maps/fortitude.cfg | 2 +- maps/institute.cfg | 2 +- maps/linear.cfg | 2 +- maps/livefire.cfg | 2 +- maps/neodrive.cfg | 2 +- maps/oneiroi.cfg | 2 +- maps/pumpstation.cfg | 2 +- maps/relax.cfg | 2 +- maps/rooftop.cfg | 2 +- maps/steelrat.cfg | 2 +- maps/tonatiuh.cfg | 2 +- maps/tonatiuh.mpz | Bin 2462460 -> 2542079 bytes maps/vault.cfg | 2 +- maps/wardepot.cfg | 2 +- models/jojo/grate01/normal.png | Bin 112814 -> 1952184 bytes models/jojo/grate01/skin.png | Bin 71848 -> 1341029 bytes models/jojo/grate02/normal.png | Bin 36955 -> 180621 bytes models/jojo/grate02/skin.png | Bin 7307 -> 61944 bytes models/luckystrike/fan01/fan.obj | 2651 +++++++++++++++++++++++++++++++++ models/luckystrike/fan01/md5.cfg | 14 - models/luckystrike/fan01/mesh.md5mesh | 42 - models/luckystrike/fan01/obj.cfg | 10 + models/luckystrike/package.cfg | 10 +- models/mikeplus64/package.cfg | 13 +- particles/lightzap.png | Bin 54991 -> 77498 bytes textures/action.png | Bin 4221 -> 22121 bytes textures/checkbox.png | Bin 16639 -> 17255 bytes textures/checkboxon.png | Bin 16639 -> 28146 bytes textures/checkboxtwo.png | Bin 16639 -> 28237 bytes textures/checkdisable.png | Bin 16639 -> 16007 bytes textures/guiexit.png | Bin 16639 -> 24433 bytes textures/guiskin.png | Bin 788 -> 2362 bytes textures/guiskinborder.png | Bin 804 -> 2846 bytes textures/hud/arrow.png | Bin 5591 -> 22180 bytes textures/hud/bombtaken.png | Bin 15055 -> 47474 bytes textures/hud/border.png | Bin 1597 -> 1020 bytes textures/hud/cursor.png | Bin 65972 -> 26542 bytes textures/hud/flagtaken.png | Bin 15055 -> 47474 bytes textures/hud/hurt.png | Bin 9104 -> 23845 bytes textures/radiobox.png | Bin 16639 -> 27938 bytes textures/radioboxon.png | Bin 16639 -> 37295 bytes textures/radiodisable.png | Bin 16639 -> 24550 bytes textures/warning.png | Bin 3898 -> 27084 bytes 80 files changed, 2934 insertions(+), 140 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse-data.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits