[Eliot-dev] [SCM] Eliot branch, master, updated. eliot_1.14-214-g2b6b85c

[Olivier Teulière]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Eliot".

The branch, master has been updated
       via  2b6b85cce3a6008909692f243faf24b02aee578f (commit)
       via  89892c622c42aa69754f9dd4e0ce12f7803915b0 (commit)
       via  3c298041480a003c2252470f11560d2593a820c0 (commit)
      from  7868593cb27e0306c0b04c3244ae4dd44915b253 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2b6b85cce3a6008909692f243faf24b02aee578f
Author: Olivier Teulière <address@hidden>
Date:   Sun May 20 22:12:42 2012 +0200

    Arbitration: allow removing penalties

commit 89892c622c42aa69754f9dd4e0ce12f7803915b0
Author: Olivier Teulière <address@hidden>
Date:   Sun May 20 22:10:57 2012 +0200

    Accept "<<" in the message of the ASSERT macro

commit 3c298041480a003c2252470f11560d2593a820c0
Author: Olivier Teulière <address@hidden>
Date:   Sun May 20 21:31:45 2012 +0200

    Savegames: save/load properly the warnings, penalties and solos

-----------------------------------------------------------------------

Summary of changes:
 dic/debug.h              |    4 +++-
 game/arbitration.cpp     |   18 ++++++++++++++----
 game/arbitration.h       |    3 ++-
 game/public_game.cpp     |    7 +++++--
 game/public_game.h       |    2 +-
 game/xml_reader.cpp      |   34 ++++++++++++++++++++++++++++++----
 game/xml_writer.cpp      |   28 ++++++++++++++++++++++++++++
 qt/arbit_assignments.cpp |    8 ++++----
 qt/arbit_assignments.h   |    2 +-
 utils/eliottxt.cpp       |    7 ++-----
 10 files changed, 90 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
Eliot