[atomix] 05/32: Merge branch 'upstream'
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Mar 19 18:30:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository atomix.
commit fa7b496b557662f00573162d7beb3f6f137e87a9
Merge: 9475c3c 73878bb
Author: Markus Koschany <apo at gambaru.de>
Date: Thu Mar 19 16:26:21 2015 +0100
Merge branch 'upstream'
Conflicts:
src/board.c
.gitignore | 59 +
COPYING | 4 +-
Makefile.am | 31 +-
NEWS | 68 ++
atomix.doap | 14 +-
configure.ac | 27 +-
data/Makefile.am | 35 +
atomix-icon.png => data/atomix-icon.png | Bin
atomix-logo.png => data/atomix-logo.png | Bin
data/atomix.appdata.xml.in | 24 +
atomix.desktop.in => data/atomix.desktop.in | 7 +-
{level => data/level}/Makefile.am | 0
{level => data/level}/aceticacid.atomix.xml | 0
{level => data/level}/acetone.atomix.xml | 0
{level => data/level}/butanol.atomix.xml | 0
{level => data/level}/cyclobutane.atomix.xml | 0
{level => data/level}/dimethylether.atomix.xml | 0
{level => data/level}/ethanal.atomix.xml | 0
{level => data/level}/ethane.atomix.xml | 0
{level => data/level}/ethanol.atomix.xml | 0
{level => data/level}/ethylene.atomix.xml | 0
{level => data/level}/glycerin.atomix.xml | 0
{level => data/level}/lactic-acid.atomix.xml | 0
{level => data/level}/methanal.atomix.xml | 0
{level => data/level}/methane.atomix.xml | 0
{level => data/level}/methanol.atomix.xml | 0
{level => data/level}/propanal.atomix.xml | 0
{level => data/level}/propylene.atomix.xml | 0
{level => data/level}/pyran.atomix.xml | 0
{level => data/level}/sequence | 0
{level => data/level}/transbutylen.atomix.xml | 0
{level => data/level}/water.atomix.xml | 0
{themes => data/themes}/Makefile.am | 0
{themes => data/themes}/default/Makefile.am | 0
{themes => data/themes}/default/arrow-bottom.png | Bin
{themes => data/themes}/default/arrow-left.png | Bin
{themes => data/themes}/default/arrow-right.png | Bin
{themes => data/themes}/default/arrow-top.png | Bin
{themes => data/themes}/default/atom-c.png | Bin
{themes => data/themes}/default/atom-f.png | Bin
{themes => data/themes}/default/atom-h.png | Bin
{themes => data/themes}/default/atom-n.png | Bin
{themes => data/themes}/default/atom-o.png | Bin
{themes => data/themes}/default/cursor.png | Bin
data/themes/default/decor-fence.png | Bin 0 -> 206 bytes
data/themes/default/decor-holes.png | Bin 0 -> 237 bytes
data/themes/default/decor-liquid.png | Bin 0 -> 945 bytes
{themes => data/themes}/default/floor.png | Bin
.../themes}/default/link-bottom-double.png | Bin
.../themes}/default/link-bottom-left.png | Bin
.../themes}/default/link-bottom-right.png | Bin
{themes => data/themes}/default/link-bottom.png | Bin
.../themes}/default/link-left-double.png | Bin
{themes => data/themes}/default/link-left.png | Bin
.../themes}/default/link-right-double.png | Bin
{themes => data/themes}/default/link-right.png | Bin
.../themes}/default/link-top-double.png | Bin
{themes => data/themes}/default/link-top-left.png | Bin
{themes => data/themes}/default/link-top-right.png | Bin
{themes => data/themes}/default/link-top.png | Bin
.../themes}/default/shadow-bottom-right.png | Bin
.../themes}/default/shadow-left-top.png | Bin
{themes => data/themes}/default/shadow-left.png | Bin
.../themes}/default/shadow-top-left-both.png | Bin
.../themes}/default/shadow-top-left.png | Bin
{themes => data/themes}/default/shadow-top.png | Bin
{themes => data/themes}/default/theme | 0
.../themes}/default/wall-bottom-left.png | Bin
.../themes}/default/wall-bottom-right.png | Bin
.../themes}/default/wall-horizontal-bottomx.png | Bin
.../themes}/default/wall-horizontal-left-end.png | Bin
.../themes}/default/wall-horizontal-right-end.png | Bin
.../themes}/default/wall-horizontal-topx.png | Bin
.../themes}/default/wall-horizontal.png | Bin
{themes => data/themes}/default/wall-single.png | Bin
{themes => data/themes}/default/wall-top-left.png | Bin
{themes => data/themes}/default/wall-top-right.png | Bin
.../themes}/default/wall-vertical-bottom-end.png | Bin
.../themes}/default/wall-vertical-leftx.png | Bin
.../themes}/default/wall-vertical-rightx.png | Bin
.../themes}/default/wall-vertical-top-end.png | Bin
{themes => data/themes}/default/wall-vertical.png | Bin
data/ui/Makefile.am | 5 +
data/ui/interface.ui | 382 ++++++
po/LINGUAS | 1 +
po/POTFILES.in | 47 +-
po/bs.po | 234 ++++
po/cs.po | 312 ++---
po/es.po | 310 ++---
po/he.po | 277 ++---
po/hu.po | 294 ++---
po/lt.po | 303 ++---
po/pl.po | 248 ++--
po/pt_BR.po | 296 ++---
po/sr at Latn.po | 291 -----
po/sv.po | 290 +++--
src/Makefile.am | 28 +-
src/board-gtk.c | 972 ++++++++++++++++
src/{board.h => board-gtk.h} | 47 +-
src/board.c | 1217 --------------------
src/canvas_helper.c | 52 +-
src/canvas_helper.h | 16 +-
src/clock.c | 11 +-
src/clock.h | 2 +-
src/games-show.c | 60 +-
src/games-show.h | 2 +-
src/goal-view.c | 70 +-
src/goal-view.h | 6 +-
src/goal.c | 5 +-
src/goal.h | 2 +-
src/level-convert.c | 665 -----------
src/level-manager.c | 92 +-
src/level-manager.h | 2 +-
src/level-private.h | 2 +-
src/level.c | 67 +-
src/level.h | 2 +-
src/main.c | 336 ++----
src/main.h | 10 +-
src/pf-test.c | 2 -
src/playfield.c | 91 +-
src/playfield.h | 6 +-
src/preferences.c | 2 +-
src/preferences.h | 2 +-
src/theme-manager.c | 301 +++--
src/theme-manager.h | 2 +-
src/theme-private.h | 2 +-
src/theme.c | 104 +-
src/theme.h | 4 +-
src/tile.c | 104 +-
src/tile.h | 6 +-
src/undo.c | 4 +-
src/undo.h | 6 +-
src/{level-private.h => xml-util.c} | 38 +-
src/{goal-view.h => xml-util.h} | 24 +-
134 files changed, 3452 insertions(+), 4471 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/atomix.git
More information about the Pkg-games-commits
mailing list