[atomix] 03/09: Merge tag 'upstream/3.18.0'

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository atomix.

commit e577637d09244e1c867fbe288e2e713b147bce27
Merge: 3115d8c 0df8ade
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Oct 3 13:06:47 2015 +0200

    Merge tag 'upstream/3.18.0'
    
    Upstream version 3.18.0
    
    # gpg: Signature made Sat 03 Oct 2015 13:06:43 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 NEWS                                |   26 +
 configure.ac                        |    5 +-
 data/level-transform.xsl            |   47 ++
 data/level/aceticacid.atomix.xml    |  716 +++++++--------------
 data/level/acetone.atomix.xml       | 1048 +++++++++++-------------------
 data/level/butanol.atomix.xml       | 1214 ++++++++++++-----------------------
 data/level/cyclobutane.atomix.xml   |  887 +++++++++----------------
 data/level/dimethylether.atomix.xml | 1047 ++++++++++--------------------
 data/level/ethanal.atomix.xml       |  776 ++++++++--------------
 data/level/ethane.atomix.xml        |  772 ++++++++--------------
 data/level/ethanol.atomix.xml       |  833 ++++++++----------------
 data/level/ethylene.atomix.xml      |  712 +++++++-------------
 data/level/glycerin.atomix.xml      | 1082 +++++++++++--------------------
 data/level/lactic-acid.atomix.xml   | 1049 +++++++++++-------------------
 data/level/methanal.atomix.xml      |  917 +++++++++-----------------
 data/level/methane.atomix.xml       |  767 ++++++++--------------
 data/level/methanol.atomix.xml      |  781 ++++++++--------------
 data/level/propanal.atomix.xml      |  962 ++++++++++-----------------
 data/level/propylene.atomix.xml     |  888 +++++++++----------------
 data/level/pyran.atomix.xml         | 1030 ++++++++++-------------------
 data/level/transbutylen.atomix.xml  | 1076 +++++++++++--------------------
 data/level/water.atomix.xml         |  548 ++++++----------
 po/ca.po                            |  309 +++++----
 po/el.po                            |  329 +++++-----
 po/es.po                            |  708 ++++++++++----------
 po/he.po                            |   26 +-
 po/lt.po                            |    3 +-
 po/oc.po                            |  338 +++++-----
 po/pl.po                            |   26 +-
 po/pt.po                            |  371 +++++++----
 po/ru.po                            |  266 ++++----
 po/tr.po                            |  341 +++++-----
 src/Makefile.am                     |    1 +
 src/board-gtk.c                     |   16 +-
 src/clock.c                         |   79 ++-
 src/clock.h                         |   15 +-
 src/goal.c                          |    3 -
 src/level-manager.c                 |  148 ++---
 src/level.c                         |   76 ++-
 src/level.h                         |   13 +-
 src/main.c                          |   46 +-
 src/playfield.c                     |  246 ++++---
 src/playfield.h                     |   25 +-
 src/theme-manager.c                 |    5 +-
 src/theme-private.h                 |    2 +-
 src/theme.c                         |   10 +-
 src/tile.c                          |  126 ++--
 src/tile.h                          |   22 +-
 48 files changed, 7838 insertions(+), 12895 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/atomix.git