[boinc] 02/12: Merge tag 'upstream/7.4.14+dfsg'

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit 11f9ecf4da7aee65ab004bca3a958c68ec7e905e
Merge: 4ca63a0 efad3c0
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Aug 12 11:06:32 2014 +0200

    Merge tag 'upstream/7.4.14+dfsg'
    
    Upstream version 7.4.14+dfsg

 android/BOINC/AndroidManifest.xml                  |   4 +-
 .../attach_project_batch_processing_layout.xml     |  14 ++
 .../layout/attach_project_list_layout_listitem.xml |  10 ++
 android/BOINC/res/menu/projects_menu.xml           |   4 -
 android/BOINC/res/values/strings.xml               |  10 +-
 .../src/edu/berkeley/boinc/ProjectsFragment.java   |  18 --
 .../edu/berkeley/boinc/attach/AcctMgrFragment.java |  20 ++-
 .../boinc/attach/BatchProcessingActivity.java      |  15 +-
 .../boinc/attach/SelectionListActivity.java        |  10 ++
 .../boinc/attach/SelectionListAdapter.java         |  63 +++++--
 client/app.cpp                                     |  22 ++-
 client/app.h                                       |  10 +-
 client/app_config.cpp                              |  34 +++-
 client/app_config.h                                |   2 +
 client/app_control.cpp                             |  91 +++++-----
 client/app_start.cpp                               |  64 ++++---
 client/client_state.cpp                            |  30 +++-
 client/client_state.h                              |   9 +-
 client/client_types.cpp                            |  12 +-
 client/client_types.h                              |   4 +-
 client/cpu_sched.cpp                               |  19 +-
 client/cs_account.cpp                              |   4 +-
 client/cs_cmdline.cpp                              |   4 -
 client/cs_notice.cpp                               |   3 +
 client/cs_scheduler.cpp                            |  36 ++--
 client/cs_trickle.cpp                              |  14 +-
 client/file_names.h                                |   1 +
 client/gpu_detect.cpp                              |  76 ++++++++
 client/gpu_detect.h                                |   9 +
 client/gpu_opencl.cpp                              |  75 ++++++--
 client/project.cpp                                 |   6 +
 client/project.h                                   |   5 +
 client/result.h                                    |  17 +-
 client/rr_sim.cpp                                  |  48 +++---
 client/sandbox.cpp                                 | 192 ++++++++++++++++-----
 client/scheduler_op.cpp                            |   2 +
 client/sim.cpp                                     |  21 +--
 client/switcher.cpp                                |  10 +-
 client/work_fetch.cpp                              |  49 +++++-
 client/work_fetch.h                                |   2 +
 clientgui/DlgAdvPreferences.cpp                    |  28 ++-
 clientgui/DlgAdvPreferencesBase.cpp                | 121 +++++++------
 clientgui/DlgAdvPreferencesBase.h                  |   3 +-
 clientgui/MainDocument.cpp                         |  34 ++++
 clientgui/MainDocument.h                           |   1 +
 clientgui/ViewResources.cpp                        |  30 +---
 clientgui/ViewStatistics.cpp                       |  38 +---
 clientgui/ViewStatistics.h                         |  12 --
 configure.ac                                       |   2 +-
 db/boinc_db_types.h                                |   5 +
 lib/coproc.cpp                                     |  44 +++--
 lib/coproc.h                                       |  41 ++++-
 lib/error_numbers.h                                |   1 +
 lib/gui_rpc_client.h                               |   1 +
 lib/gui_rpc_client_ops.cpp                         |   2 +
 lib/gui_rpc_client_print.cpp                       |   1 +
 lib/opencl_boinc.h                                 |   4 +-
 lib/proc_control.cpp                               |   4 +
 lib/procinfo_mac.cpp                               |   7 +-
 lib/shmem.cpp                                      |   2 +-
 lib/str_util.cpp                                   |   1 +
 lib/util.cpp                                       |  25 +++
 lib/util.h                                         |   2 +
 sched/handle_request.cpp                           |   7 +-
 sched/sched_types.cpp                              |  11 +-
 65 files changed, 1030 insertions(+), 436 deletions(-)

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