[Eliot-dev] [SCM] Eliot branch, master, updated. eliot_1.14-194-g6c16f20

[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  6c16f203a57b32436b0dff6893ad0fb836bf77d3 (commit)
       via  4b4b715a41ed9b407fff9905b25b99b81b7543ec (commit)
       via  4620d90f617eb1d85a27fadacb2fb21278770cd5 (commit)
      from  f83b39754961a757f072bd4883960d2eb4723c84 (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 6c16f203a57b32436b0dff6893ad0fb836bf77d3
Author: Olivier Teulière <address@hidden>
Date:   Sun Apr 29 02:19:59 2012 +0200

    Warn on game creation before showing the new game dialog, not after

commit 4b4b715a41ed9b407fff9905b25b99b81b7543ec
Author: Olivier Teulière <address@hidden>
Date:   Sun Apr 29 01:49:03 2012 +0200

    New options to desactivate the confirmation dialogs, and rework of the 
preferences window.

commit 4620d90f617eb1d85a27fadacb2fb21278770cd5
Author: Olivier Teulière <address@hidden>
Date:   Sat Apr 28 15:31:21 2012 +0200

    Contribs: update all the libs, except Qt. This fixes linking with log4cxx 
on win32.

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

Summary of changes:
 extras/contrib/Makefile                            |  194 ++---
 extras/contrib/apr-force-large-files-support.patch |   15 +
 extras/contrib/log4cxx-pkg-config.patch            |    9 +
 qt/arbit_assignments.cpp                           |   31 +-
 qt/arbitration_widget.cpp                          |    5 +-
 qt/main_window.cpp                                 |   50 +-
 qt/prefs_dialog.cpp                                |   60 ++-
 qt/prefs_dialog.h                                  |   14 +-
 qt/qtcommon.cpp                                    |   95 ++-
 qt/qtcommon.h                                      |    3 +-
 qt/ui/prefs_dialog.ui                              |  949 ++++++++++++--------
 11 files changed, 893 insertions(+), 532 deletions(-)
 create mode 100644 extras/contrib/apr-force-large-files-support.patch
 create mode 100644 extras/contrib/log4cxx-pkg-config.patch


hooks/post-receive
-- 
Eliot