[boinc] 02/03: Merge tag 'upstream/7.4.7+dfsg'
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Fri Jun 27 15:50:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository boinc.
commit ed8fc921d83f1b70908473ed70863e6d7545d988
Merge: 485622e d89826d
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Jun 27 16:40:52 2014 +0200
Merge tag 'upstream/7.4.7+dfsg'
Upstream version 7.4.7+dfsg
Conflicts:
version.log
.gitattributes | 23 +
Makefile.incl | 1 +
android/BOINC/AndroidManifest.xml | 4 +-
client/cs_notice.cpp | 8 +-
client/cs_notice.h | 4 +
client/cs_statefile.cpp | 5 +-
client/log_flags.cpp | 11 +-
clientgui/BOINCBaseFrame.cpp | 5 -
clientgui/BOINCBaseFrame.h | 3 -
clientgui/BOINCGUIApp.cpp | 265 ++-
clientgui/BOINCGUIApp.h | 2 +
clientgui/BOINCListCtrl.cpp | 2 +-
clientgui/DlgAdvPreferences.cpp | 135 +-
clientgui/DlgAdvPreferences.h | 5 +-
clientgui/DlgAdvPreferencesBase.cpp | 71 +-
clientgui/DlgOptions.cpp | 6 +-
clientgui/ViewProjects.cpp | 3 +-
clientgui/ViewTransfers.cpp | 3 +
clientgui/ViewWork.cpp | 2 +-
clientgui/res/atiicon.xpm | 574 +++---
clientgui/res/blankicon.xpm | 78 +-
clientgui/res/externalweblink.xpm | 92 +-
clientgui/res/nvidiaicon.xpm | 282 +--
.../default/graphic/workunit_running_image.xpm | 224 +--
.../default/graphic/workunit_waiting_image.xpm | 176 +-
.../res/templates/skins/Resource Information.txt | 14 +-
clientgui/sg_ProjectCommandPopup.cpp | 4 +-
clientgui/sg_ProjectWebSitesPopup.cpp | 4 +-
clientgui/sg_TaskCommandPopup.cpp | 4 +-
clientgui/skins/Charity Engine/skin.xml | 210 +--
clientgui/skins/Default/skin.xml | 78 +-
clientgui/skins/GridRepublic/skin.xml | 210 +--
clientgui/skins/ProgressThruProcessors/skin.xml | 210 +--
configure.ac | 2 +-
db/boinc_db_types.h | 8 +-
dcapi/java/example/boinc-java-launcher | 34 +-
dcapi/java/jre-boinc/jre_for_boinc_guide.txt | 82 +-
html/languages/translations/fi.po | 7 +-
html/languages/translations/hu.po | 2 +-
html/languages/translations/nl.po | 32 +-
html/user/top_hosts.php | 2 +-
lib/notice.cpp | 15 +-
lib/notice.h | 6 +-
lib/str_util.cpp | 2 +-
locale/ar/BOINC-Web.po | 180 +-
locale/be/BOINC-Manager.po | 94 +-
locale/be/BOINC-Web.po | 246 +--
locale/bg/BOINC-Web.po | 30 +-
locale/ca/BOINC-Android.po | 8 +-
locale/ca/BOINC-Setup.po | 2 +-
locale/ca/BOINC-Web.mo | Bin 36904 -> 37107 bytes
locale/ca/BOINC-Web.po | 6 +-
locale/da/BOINC-Manager.po | 1895 ++++++++++----------
locale/da/BOINC-Project-Generic.po | 601 +++----
locale/da/BOINC-Setup.po | 50 +-
locale/da/BOINC-Web.po | 322 ++--
locale/el/BOINC-Web.po | 24 +-
locale/fi/BOINC-Android.po | 7 +-
locale/fi/BOINC-Manager.mo | Bin 73083 -> 73214 bytes
locale/fi/BOINC-Manager.po | 16 +-
locale/fi/BOINC-Project-Generic.po | 7 +-
locale/fr/BOINC-Web.po | 14 +-
locale/gl/BOINC-Web.po | 14 +-
locale/hr/BOINC-Web.po | 24 +-
locale/hu/BOINC-Project-Generic.po | 2 +-
locale/hu/BOINC-Web.po | 24 +-
locale/it_IT/BOINC-Project-Generic.po | 2 +-
locale/ko/BOINC-Manager.po | 70 +-
locale/ko/BOINC-Project-Generic.po | 873 ++++-----
locale/ko/BOINC-Setup.po | 10 +-
locale/ko/BOINC-Web.po | 333 ++--
locale/lv/BOINC-Manager.po | 10 +-
locale/lv/BOINC-Web.po | 24 +-
locale/ms/BOINC-Android.po | 1 -
locale/ms/BOINC-Client.po | 1 -
locale/ms/BOINC-Manager.po | 1 -
locale/ms/BOINC-Project-Generic.po | 3 -
locale/ms/BOINC-Setup.po | 1 -
locale/nl/BOINC-Project-Generic.po | 32 +-
locale/nl/BOINC-Web.po | 4 +-
locale/pl/BOINC-Web.po | 2 +-
locale/pt_BR/BOINC-Web.po | 32 +-
locale/ro/BOINC-Web.po | 24 +-
locale/ru/BOINC-Manager.po | 1213 +++++++------
locale/ru/BOINC-Project-Generic.po | 630 +++----
locale/ru/BOINC-Setup.po | 50 +-
locale/ru/BOINC-Web.po | 217 +--
locale/sk/BOINC-Web.po | 20 +-
locale/sv_SE/BOINC-Web.po | 24 +-
locale/uk/BOINC-Web.mo | Bin 48855 -> 49109 bytes
locale/uk/BOINC-Web.po | 7 +-
locale/zh_CN/BOINC-Android.po | 11 +-
locale/zh_CN/BOINC-Manager.po | 2 +
locale/zh_CN/BOINC-Setup.po | 1 +
locale/zh_TW/BOINC-Web.po | 20 +-
samples/nvcuda/Makefile | 26 +-
samples/nvcuda/Makefile_mac | 24 +-
samples/nvcuda/common_mac.mk | 942 +++++-----
samples/nvcuda/cuda_kernel.cu | 264 +--
samples/openclapp/Makefile_AMD | 88 +-
samples/openclapp/Makefile_NVIDIA | 88 +-
samples/openclapp/Makefile_mac | 86 +-
samples/openclapp/openclapp.hpp | 456 ++---
samples/openclapp/openclapp_kernels.cl | 98 +-
.../vboxwrapper/deprecated/mscom/VirtualBox_i.c | 936 +++++-----
samples/wrapper/regexp_report.c | 2 +-
sched/Makefile.am | 5 +-
sched/sched_util.cpp | 287 +--
sched/sched_util.h | 58 +-
sched/{sched_util.cpp => sched_util_basic.cpp} | 105 --
sched/{sched_util.h => sched_util_basic.h} | 38 +-
sched/sched_version.cpp | 2 +-
version.log | 1 +
113 files changed, 6628 insertions(+), 6972 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