[boinc] 02/03: Merge tag 'upstream/7.2.47+dfsg'

[Guo Yixuan]

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

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

commit 785ef99e2ff402f45bff9c380ac623b4dea405f7
Merge: 5ea91c5 bf5535d
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Sat Apr 5 20:45:47 2014 -0400

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

 client/gui_rpc_server_ops.cpp                      |   3 +-
 client/win/res/wcg.ico                             | Bin 353118 -> 445726 bytes
 clientgui/BOINCTaskBar.cpp                         |   3 --
 clientgui/res/wcg.ico                              | Bin 353118 -> 445726 bytes
 clientgui/res/wcgdisconnect.ico                    | Bin 445726 -> 35710 bytes
 clientgui/res/wcgsnooze.ico                        | Bin 445726 -> 26054 bytes
 .../World Community Grid/background_image.png      | Bin 600463 -> 161527 bytes
 clientgui/skins/World Community Grid/skin.xml      |  48 +-------------------
 clientgui/skins/World Community Grid/wcg_32.png    | Bin 2546 -> 838 bytes
 clientgui/skins/World Community Grid/wcg_pause.png | Bin 615 -> 658 bytes
 clientgui/skins/World Community Grid/wcg_play.png  | Bin 583 -> 531 bytes
 clientgui/skins/World Community Grid/wcg_stop.png  | Bin 497 -> 688 bytes
 clientscr/res/boinc_logo_black.jpg                 | Bin 0 -> 36235 bytes
 clientscr/res/gridrepublic_ss_logo.jpg             | Bin 0 -> 9366 bytes
 clientscr/res/progress_ss_logo.jpg                 | Bin 0 -> 5696 bytes
 clientscr/res/wcg.bmp                              | Bin 135254 -> 108054 bytes
 clientscr/res/wcg.ico                              | Bin 353118 -> 445726 bytes
 clientscr/res/wcg_ss_logo.jpg                      | Bin 0 -> 16309 bytes
 clientscr/ss_app.cpp                               |  27 ++++++++++--
 configure.ac                                       |   2 +-
 lib/common_defs.h                                  |   7 ++-
 lib/win_util.cpp                                   |  49 +++++++++++++++++++++
 lib/win_util.h                                     |   1 +
 23 files changed, 81 insertions(+), 59 deletions(-)

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