[gnurobbo] 02/07: Merge tag 'upstream/0.68+dfsg'
Stephen Kitt
skitt at moszumanska.debian.org
Thu Aug 27 21:12:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository gnurobbo.
commit 546abdd0550462bbcef6547c55d95d13e0f4f5d7
Merge: 79cca81 fa8dd9e
Author: Stephen Kitt <steve at sk2.org>
Date: Thu Aug 27 22:49:10 2015 +0200
Merge tag 'upstream/0.68+dfsg'
Upstream version 0.68+dfsg
ChangeLog | 4 +
Makefile | 36 +-
Makefile => Makefile.caanoo | 57 +-
Makefile => Makefile.pandora | 43 +-
NEWS | 6 +
README.txt | 223 +
VERSION | 2 +-
board.c | 3563 ++++++++------
board.h | 45 +-
controls.c | 6 +-
data/levels/76.dat | 1550 ++++++
data/levels/TreRobbo01_l18.dat | 1270 +++++
data/levels/TreRobbo02_l32.dat | 2311 +++++++++
data/levels/TreRobbo03_l10.dat | 752 +++
data/levels/TreRobbo04_l10.dat | 756 +++
data/levels/TreRobbo05_l10.dat | 757 +++
data/levels/TreRobbo06_l10.dat | 690 +++
data/levels/TreRobbo07_l10.dat | 682 +++
data/levels/TreRobbo08_l10.dat | 670 +++
data/levels/TreRobbo09_l10.dat | 749 +++
data/levels/TreRobbo10_l10.dat | 757 +++
data/levels/TreRobbo11_l09.dat | 765 +++
data/levels/TreRobbo12_l10.dat | 683 +++
data/levels/TreRobbo13_l10.dat | 661 +++
data/levels/TreRobbo14_l10.dat | 647 +++
data/levels/TreRobbo15_l10.dat | 861 ++++
data/levels/TreRobbo16_l10.dat | 709 +++
data/levels/TreRobbo17_l10.dat | 632 +++
data/levels/TreRobbo18_l10.dat | 651 +++
data/levels/TreRobbo19_l10.dat | 748 +++
data/levels/TreRobbo20_l10.dat | 987 ++++
data/levels/TreRobbo21_l10.dat | 731 +++
data/levels/TreRobbo22_l10.dat | 652 +++
data/levels/TreRobbo23_l10.dat | 729 +++
data/levels/TreRobbo24_l10.dat | 764 +++
data/levels/TreRobbo25_l10.dat | 736 +++
data/levels/TreRobbo28_l10.dat | 741 +++
data/levels/alex01.dat | 64 +-
data/levels/designer.dat | 43 +-
data/levels/forever.dat | 67 +-
data/levels/gedzior.dat | 1215 +++++
data/levels/lutry.dat | 9476 +++++++++++++++++++++++++++++++++++++
data/levels/original.dat | 47 +-
data/levels/pandino.dat | 712 +++
data/levels/robbo01.dat | 21 +-
data/levels/robbo04.dat | 465 +-
data/levels/robbo05.dat | 62 +-
data/levels/robbo14.dat | 2058 ++++++++
data/levels/robbo15.dat | 2295 +++++++++
data/levels/robbo2009.dat | 1685 ++++---
data/levels/sws01.dat | 652 +++
data/levels/sws02.dat | 652 +++
data/levels/sws03.dat | 652 +++
data/levels/sws04.dat | 648 +++
data/levels/swsMagnetic.dat | 696 +++
data/levels/swsTheBest.dat | 2184 +++++++++
data/levels/to.dat | 2407 ++++++++++
data/locales/cz_CZ/text | 3 +
data/locales/de_DE/text | 3 +
data/locales/en_GB/text | 4 +
data/locales/id_ID/text | 3 +
data/locales/pl_PL/text | 9 +-
data/locales/ru_RU/text | 3 +
data/locales/sk_SK/text | 3 +
data/locales/sv_SE/text | 3 +
data/skins/oily/EFX16.png | Bin 0 -> 33758 bytes
data/skins/oily/EFX32.png | Bin 0 -> 90369 bytes
data/skins/oily/icons16.png | Bin 31752 -> 40990 bytes
data/skins/oily/icons32.png | Bin 123170 -> 126179 bytes
data/skins/oily/k_icons16.png | Bin 25879 -> 27436 bytes
data/skins/oily/k_icons32.png | Bin 78681 -> 86505 bytes
data/skins/oily/skinrc | 1 +
data/skins/original/EFX16.png | Bin 0 -> 33758 bytes
data/skins/original/EFX32.png | Bin 0 -> 87372 bytes
data/skins/original/icons16.png | Bin 6948 -> 7571 bytes
data/skins/original/icons32.png | Bin 6628 -> 7021 bytes
data/skins/original/k_icons16.png | Bin 21742 -> 26082 bytes
data/skins/original/k_icons32.png | Bin 76080 -> 81104 bytes
data/skins/tronic/EFX16.png | Bin 0 -> 33758 bytes
data/skins/tronic/EFX32.png | Bin 0 -> 87372 bytes
data/skins/tronic/icons16.png | Bin 5085 -> 5303 bytes
data/skins/tronic/icons32.png | Bin 6596 -> 6999 bytes
data/skins/tronic/k_icons16.png | Bin 2429 -> 2565 bytes
data/skins/tronic/k_icons32.png | Bin 3308 -> 3555 bytes
fremantle/Makefile | 2 +-
fremantle/launchrobbo.sh | 2 +
game.c | 10 +-
game.h | 14 +
icons/gnurobbo.16.png | Bin 0 -> 209 bytes
icons/gnurobbo.32.png | Bin 0 -> 310 bytes
icons/gnurobbo.48.png | Bin 0 -> 258 bytes
konstruktor.c | 35 +-
konstruktor.h | 10 +
levels.c | 175 +-
locales.c | 7 +-
locales.h | 1 +
rcfile.c | 11 +
rcfile.h | 2 +-
screen.c | 758 ++-
screen.h | 3 +
skins.c | 32 +-
skins.h | 3 +
sound.c | 2 +-
tools/AtariRobboLevelInfo.txt | 23 +
tools/LevelFormats.txt | 50 +
tools/background_tronic.xcf | Bin 0 -> 19289 bytes
tools/catutf8.c | 80 +
tools/convert.sh | 19 +
tools/fcp.c | 81 +
tools/font12x16.xcf | Bin 0 -> 157317 bytes
tools/icons_tronic.xcf | Bin 0 -> 42154 bytes
tools/k_icons_tronic.xcf | Bin 0 -> 33494 bytes
tools/lcolorify.awk | 59 +
tools/lmerge.awk | 73 +
tools/lmerge.sh | 9 +
tools/lvdump_millenium.c | 543 +++
tools/lvldump.c | 530 +++
tools/lvldump_rob.c | 583 +++
tools/robbo_millenium.txt | 30 +
119 files changed, 53333 insertions(+), 2573 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gnurobbo.git
More information about the Pkg-games-commits
mailing list