[boinc] 05/06: Merge tag 'upstream/7.2.44+dfsg'
Guo Yixuan
yixuan-guest at moszumanska.debian.org
Sun Apr 6 00:42:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
yixuan-guest pushed a commit to branch master
in repository boinc.
commit 1d41519ef32a1afdf0532fc68f1e5863de88d224
Merge: 3c7be22 4204c10
Author: Guo Yixuan <culu.gyx at gmail.com>
Date: Sat Apr 5 13:09:03 2014 -0400
Merge tag 'upstream/7.2.44+dfsg'
Upstream version 7.2.44+dfsg
client/win/boinc_cli.rc | 2 +-
client/win/boinc_cmd.rc | 2 +-
client/win/boinc_log.rc | 2 +-
client/win/res/boinc.ico | Bin 0 -> 445726 bytes
client/win/res/icon.ico | Bin 284646 -> 0 bytes
clientgui/AdvancedFrame.cpp | 7 +-
clientgui/AdvancedFrame.h | 2 +-
clientgui/BOINCGUIApp.cpp | 3 -
clientgui/BOINCGUIApp.rc | 46 +-
clientgui/BOINCTaskBar.cpp | 31 +-
clientgui/BOINCTaskBar.h | 4 +-
clientgui/DlgAdvPreferences.cpp | 2 +-
clientgui/DlgEventLog.cpp | 5 +-
clientgui/SkinManager.cpp | 164 ++++-
clientgui/SkinManager.h | 71 +-
clientgui/res/boinc.ico | Bin 0 -> 445726 bytes
clientgui/res/boinc.xpm | 114 +++-
clientgui/res/boinc32.xpm | 725 ++++++---------------
clientgui/res/boincdisconnect.ico | Bin 0 -> 445726 bytes
clientgui/res/boincdisconnect.xpm | 129 +++-
clientgui/res/boincdisconnect32.xpm | 253 +++++++
clientgui/res/boincmgr.16x16.png | Bin 815 -> 0 bytes
clientgui/res/boincmgr.32x32.png | Bin 2395 -> 0 bytes
clientgui/res/boincmgr.48x48.png | Bin 5570 -> 0 bytes
clientgui/res/boincsnooze.ico | Bin 0 -> 445726 bytes
clientgui/res/boincsnooze.xpm | 101 ++-
clientgui/res/boincsnooze32.xpm | 203 ++++++
.../res/skins/default/graphic/project_image.xpm | 465 ++++++-------
...014 BOINC Program Logo Design - Jacob Klein.pdn | Bin 0 -> 369966 bytes
.../icons/Design Template/Design Notes.txt | 81 +++
.../icons/Design Template/Other Ideas.pdn | Bin 0 -> 269090 bytes
...pha Transparency - Disconnected - 128 x 128.png | Bin 0 -> 9687 bytes
...Alpha Transparency - Disconnected - 16 x 16.png | Bin 0 -> 828 bytes
...Alpha Transparency - Disconnected - 20 x 20.png | Bin 0 -> 1122 bytes
...Alpha Transparency - Disconnected - 24 x 24.png | Bin 0 -> 1392 bytes
...pha Transparency - Disconnected - 256 x 256.png | Bin 0 -> 23830 bytes
...Alpha Transparency - Disconnected - 32 x 32.png | Bin 0 -> 1909 bytes
...Alpha Transparency - Disconnected - 40 x 40.png | Bin 0 -> 2469 bytes
...Alpha Transparency - Disconnected - 48 x 48.png | Bin 0 -> 3060 bytes
...Alpha Transparency - Disconnected - 64 x 64.png | Bin 0 -> 4226 bytes
...Alpha Transparency - Disconnected - 80 x 80.png | Bin 0 -> 5530 bytes
...Alpha Transparency - Disconnected - 96 x 96.png | Bin 0 -> 6739 bytes
...n - Alpha Transparency - Normal - 128 x 128.png | Bin 0 -> 9924 bytes
...con - Alpha Transparency - Normal - 16 x 16.png | Bin 0 -> 827 bytes
...con - Alpha Transparency - Normal - 20 x 20.png | Bin 0 -> 1107 bytes
...con - Alpha Transparency - Normal - 24 x 24.png | Bin 0 -> 1383 bytes
...n - Alpha Transparency - Normal - 256 x 256.png | Bin 0 -> 25047 bytes
...con - Alpha Transparency - Normal - 32 x 32.png | Bin 0 -> 1901 bytes
...con - Alpha Transparency - Normal - 40 x 40.png | Bin 0 -> 2445 bytes
...con - Alpha Transparency - Normal - 48 x 48.png | Bin 0 -> 3048 bytes
...con - Alpha Transparency - Normal - 64 x 64.png | Bin 0 -> 4231 bytes
...con - Alpha Transparency - Normal - 80 x 80.png | Bin 0 -> 5576 bytes
...con - Alpha Transparency - Normal - 96 x 96.png | Bin 0 -> 6820 bytes
... Alpha Transparency - Suspended - 128 x 128.png | Bin 0 -> 8643 bytes
... - Alpha Transparency - Suspended - 16 x 16.png | Bin 0 -> 755 bytes
... - Alpha Transparency - Suspended - 20 x 20.png | Bin 0 -> 1064 bytes
... - Alpha Transparency - Suspended - 24 x 24.png | Bin 0 -> 1322 bytes
... Alpha Transparency - Suspended - 256 x 256.png | Bin 0 -> 21173 bytes
... - Alpha Transparency - Suspended - 32 x 32.png | Bin 0 -> 1784 bytes
... - Alpha Transparency - Suspended - 40 x 40.png | Bin 0 -> 2258 bytes
... - Alpha Transparency - Suspended - 48 x 48.png | Bin 0 -> 2799 bytes
... - Alpha Transparency - Suspended - 64 x 64.png | Bin 0 -> 3847 bytes
... - Alpha Transparency - Suspended - 80 x 80.png | Bin 0 -> 5060 bytes
... - Alpha Transparency - Suspended - 96 x 96.png | Bin 0 -> 6091 bytes
...sparency (For XPM) - Disconnected - 16 x 16.png | Bin 0 -> 563 bytes
...sparency (For XPM) - Disconnected - 32 x 32.png | Bin 0 -> 1230 bytes
...sparency (For XPM) - Disconnected - 40 x 40.png | Bin 0 -> 1540 bytes
...x Transparency (For XPM) - Normal - 16 x 16.png | Bin 0 -> 517 bytes
...x Transparency (For XPM) - Normal - 32 x 32.png | Bin 0 -> 1119 bytes
...x Transparency (For XPM) - Normal - 40 x 40.png | Bin 0 -> 1379 bytes
...ransparency (For XPM) - Suspended - 16 x 16.png | Bin 0 -> 496 bytes
...ransparency (For XPM) - Suspended - 32 x 32.png | Bin 0 -> 1060 bytes
...ransparency (For XPM) - Suspended - 40 x 40.png | Bin 0 -> 1407 bytes
...- White Background - Disconnected - 40 x 40.png | Bin 0 -> 2033 bytes
... Icon - White Background - Normal - 40 x 40.png | Bin 0 -> 1926 bytes
...on - White Background - Suspended - 40 x 40.png | Bin 0 -> 1814 bytes
.../Initial Mockup/BOINC Logo Flat Quartered.png | Bin 0 -> 25175 bytes
.../icons/Initial Mockup/BOINC Logo Flat.png | Bin 0 -> 25987 bytes
.../icons/References}/BOINCGUIApp.ico | Bin
.../icons/References/boinc_glossy2_512_F.tif | Bin 0 -> 288208 bytes
.../res/templates/icons/References/boinc_logo.png | Bin 0 -> 45314 bytes
.../icons/References}/boincdisconnect.xpm | 0
.../icons/References}/boincsnooze.xpm | 0
.../templates/icons/References/disconnect-icon.png | Bin 0 -> 17148 bytes
clientgui/res/wcgdisconnect.ico | Bin 0 -> 445726 bytes
clientgui/res/wcgsnooze.ico | Bin 0 -> 445726 bytes
clientgui/sg_BoincSimpleFrame.cpp | 9 +-
clientgui/sg_BoincSimpleFrame.h | 2 +-
clientgui/sg_DlgMessages.cpp | 5 +-
clientgui/sg_DlgPreferences.cpp | 5 +-
clientscr/boinc_ss.rc | 2 +-
clientscr/boinc_ss_opengl.rc | 2 +-
clientscr/res/boinc.ico | Bin 0 -> 445726 bytes
clientscr/res/icon.ico | Bin 284646 -> 0 bytes
clientscr/ss_app.cpp | 19 +
configure.ac | 2 +-
packages/generic/sea/boincmgr.16x16.png | Bin 815 -> 827 bytes
packages/generic/sea/boincmgr.32x32.png | Bin 2395 -> 1901 bytes
packages/generic/sea/boincmgr.48x48.png | Bin 5570 -> 3048 bytes
99 files changed, 1462 insertions(+), 996 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list