[lgeneral-data] 06/12: Merge tag 'upstream/1.1_rc1'

[Markus Koschany]

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

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

commit c73c0d140ef7c45505b13095cfe168d12333f93c
Merge: 2d0a38e 115e67b
Author: Markus Koschany <apo at debian.org>
Date:   Thu Jan 14 18:43:04 2016 +0100

    Merge tag 'upstream/1.1_rc1'
    
    Upstream version 1.1~rc1
    
    # gpg: Signature made Thu 14 Jan 2016 18:43:00 CET 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]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 BUGS                                               |    6 +
 ChangeLog                                          |   43 +-
 LICENSE                                            |    4 +-
 README                                             |    4 +-
 THANKS                                             |    8 +
 TODO                                               |    3 +-
 campaigns/kukgen                                   |  171 ++
 gfx/flags/kukgen.bmp                               |  Bin 18842 -> 13614 bytes
 gfx/terrain/kukgen/bridge.bmp                      |  Bin 0 -> 279054 bytes
 gfx/units/kukgen.bmp                               |  Bin 1150614 -> 1690054 bytes
 maps/kukgen.tdb                                    |  926 +++++-
 maps/kukgen/albania                                |    7 +
 maps/kukgen/ancona                                 |    7 +
 maps/kukgen/balkans_1918                           |    7 +
 maps/kukgen/bosnia                                 |    7 +
 maps/kukgen/brusilov                               |    7 +
 maps/kukgen/caporetto                              |    7 +
 maps/kukgen/carpathians                            |    7 +
 maps/kukgen/gallipolli                             |    6 +
 maps/kukgen/gorlice                                |    7 +
 maps/kukgen/isonzo_1915                            |    7 +
 maps/kukgen/isonzo_1917                            |    7 +
 maps/kukgen/kerensky                               |    7 +
 .../Balkans_-_Greek_Albania__Bulgaria_front_line   |    7 +
 .../Balkans_-_Greek_Albania__Bulgaria_front_line_2 |    7 +
 .../Balkans_-_without_front_line                   |    7 +
 .../Eastern_Front_-_Baranovichi__Tarnopol_line     |    7 +
 .../Galipoli_-_with__front_line                    |    7 +
 .../Galipoli_-_without__front_line                 |    7 +
 .../Italian_Front_-Berenta_line                    |    7 +
 .../Italian_Front_-Isonso_line_2                   |    7 +
 .../maps_without_scenerio/Italian_Front_-_Isonso   |    7 +
 .../Italian_Front_-_Piave_line                     |    7 +
 .../Italian_Front_-_Piave_line_2                   |    7 +
 .../Italian_Front_-_Piave_line_3                   |    7 +
 .../Western_Front_-_Benelux&France                 |    7 +
 maps/kukgen/otranto_1917                           |    7 +
 maps/kukgen/otranto_1918                           |    7 +
 maps/kukgen/pelagosa                               |    7 +
 maps/kukgen/piave                                  |    7 +
 maps/kukgen/romania                                |    7 +
 maps/kukgen/serbia_1914                            |    7 +
 maps/kukgen/serbia_1915                            |    7 +
 maps/kukgen/south_tyrol                            |    7 +
 maps/kukgen/the_collapse                           |    7 +
 maps/kukgen/verona                                 |    6 +
 nations/kukgen.ndb                                 |  100 +-
 scenarios/kukgen/.order                            |   22 +
 scenarios/kukgen/Albania                           |  350 +--
 scenarios/kukgen/Ancona                            |  312 +-
 scenarios/kukgen/Balkans                           | 1867 ++++++++++++
 scenarios/kukgen/Bosnia                            |  392 +--
 scenarios/kukgen/Brusilov                          |  582 ++--
 scenarios/kukgen/{TheCollapse => Caporetto}        | 3034 +++++++++++---------
 scenarios/kukgen/Carpathians                       |  686 ++---
 scenarios/kukgen/Gallipolli                        | 1344 +++++++++
 scenarios/kukgen/Gorlice                           |  680 ++---
 scenarios/kukgen/{Isonzo15 => Isonzo_1915}         |  424 +--
 scenarios/kukgen/{Isonzo17 => Isonzo_1917}         |  486 ++--
 scenarios/kukgen/Kerensky                          |  604 ++--
 scenarios/kukgen/{Otranto17 => Otranto_1917}       |  370 ++-
 scenarios/kukgen/{Otranto18 => Otranto_1918}       |  316 +-
 scenarios/kukgen/Pelagosa                          |  258 +-
 scenarios/kukgen/{TheCollapse => Piave}            | 2286 +++++++--------
 scenarios/kukgen/Romania                           |  348 +--
 scenarios/kukgen/{Serbia14 => Serbia_1914}         |  342 +--
 scenarios/kukgen/{Serbia15 => Serbia_1915}         |  394 +--
 scenarios/kukgen/{Isonzo17 => South_Tyrol}         | 1737 +++++------
 scenarios/kukgen/{TheCollapse => The_Collapse}     |  586 ++--
 scenarios/kukgen/{Isonzo17 => Verona}              | 2242 +++++++--------
 units/kukgen.udb                                   | 1466 ++++++++--
 71 files changed, 13917 insertions(+), 8719 deletions(-)

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