[boinc] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-boinc/boinc

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository boinc.

commit d70fb29e181a3fd127d1d5e8dcdf7048fcac8a5d
Merge: b95cbab 2fff880
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Thu Nov 28 15:35:07 2013 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-boinc/boinc

 client/client_state.cpp                        |  7 +++----
 client/gui_rpc_server_ops.cpp                  | 22 ++++++++++------------
 clientgui/BOINCInternetFSHandler.cpp           | 14 +++-----------
 configure.ac                                   |  2 +-
 debian/changelog                               | 12 ++++++++++++
 debian/fetch_example_applications.sh           | 16 ++--------------
 debian/get_latest_windows_wrappers.sh          |  9 +++++----
 debian/patches/disable_new_version_check.patch |  2 +-
 debian/patches/server_status_php.patch         |  2 +-
 lib/gui_rpc_client.cpp                         | 24 ++++++++++++++++++------
 10 files changed, 56 insertions(+), 54 deletions(-)

diff --cc debian/patches/server_status_php.patch
index 09e5574,09e5574..1282864
--- a/debian/patches/server_status_php.patch
+++ b/debian/patches/server_status_php.patch
@@@ -2,7 -2,7 +2,7 @@@ Index: boinc/html/user/server_status.ph
  ===================================================================
  --- boinc.orig/html/user/server_status.php
  +++ boinc/html/user/server_status.php
--@@ -207,7 +207,12 @@
++@@ -196,7 +196,12 @@
   }
   $uldl_pid = parse_element($config_vars,"<uldl_pid>");
   if ($uldl_pid == "") {

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