[boinc] 03/04: Merge tag 'upstream/7.6.2+dfsg'
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Mon Jun 1 08:42:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository boinc.
commit c1f6d27b3ed47811d2c36f9f221a23a222ed0cbd
Merge: 2294f03 6eb6a12
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Mon Jun 1 10:25:44 2015 +0200
Merge tag 'upstream/7.6.2+dfsg'
Upstream version 7.6.2+dfsg
Conflicts:
.gitignore
.gitignore | 1 +
android/BOINC/AndroidManifest.xml | 4 +-
android/BOINC/res/values-cs/strings.xml | 7 +-
android/BOINC/res/values-fr/strings.xml | 52 +-
android/BOINC/res/values-sk/strings.xml | 2 +-
android/BOINC/res/values-tr/strings.xml | 4 +-
android/BOINC/res/values-zh-rTW/strings.xml | 30 +-
build/getWxWidgets.sh | 26 -
client/app.cpp | 31 +-
client/app_control.cpp | 17 +-
client/client_state.cpp | 4 +
client/client_state.h | 2 +-
client/cs_account.cpp | 3 +-
client/cs_statefile.cpp | 6 +-
client/gpu_detect.cpp | 2 +-
client/hostinfo_win.cpp | 479 ++-
client/http_curl.cpp | 9 +-
client/http_curl.h | 2 -
client/sandbox.cpp | 31 +-
clientgui/AdvancedFrame.cpp | 83 +-
clientgui/AdvancedFrame.h | 3 +-
clientgui/BOINCGUIApp.cpp | 246 --
clientgui/BOINCListCtrl.cpp | 34 +-
clientgui/BOINCTaskBar.cpp | 24 +-
clientgui/DlgAbout.cpp | 6 +-
clientgui/DlgAdvPreferences.cpp | 51 +-
clientgui/DlgAdvPreferences.h | 2 +
clientgui/DlgAdvPreferencesBase.cpp | 199 +-
clientgui/DlgEventLog.cpp | 5 -
clientgui/Events.h | 7 +-
clientgui/MainDocument.cpp | 2 +-
clientgui/Makefile.am | 1 -
clientgui/SkinManager.cpp | 34 +-
clientgui/SkinManager.h | 21 +-
clientgui/ViewProjects.cpp | 4 +-
clientgui/ViewTransfers.cpp | 4 +-
clientgui/ViewWork.cpp | 4 +-
clientgui/WelcomePage.cpp | 426 ---
clientgui/WelcomePage.h | 96 -
clientgui/WizardAttach.cpp | 44 +-
clientgui/WizardAttach.h | 3 -
clientgui/sg_BoincSimpleFrame.cpp | 153 +-
clientgui/sg_BoincSimpleFrame.h | 5 +-
clientgui/sg_DlgPreferences.cpp | 238 +-
clientgui/sg_DlgPreferences.h | 6 +
clientgui/sg_ProjectPanel.cpp | 9 +-
clientgui/sg_ProjectPanel.h | 2 +-
configure.ac | 6 +-
db/boinc_db.cpp | 24 +-
db/schema.sql | 18 +-
doc/email_lists.php | 20 +-
doc/projects.inc | 20 +
doc/white.css | 4 +-
html/inc/forum.inc | 23 +-
html/inc/forum_db.inc | 2 +-
html/inc/forum_email.inc | 8 +-
html/inc/stats_sites.inc | 4 +-
html/inc/user.inc | 2 +-
html/ops/db_update.php | 15 +
html/ops/dbinfo.php | 2 +-
html/ops/error_summary.php | 15 +-
html/ops/grant_credit.php | 3 +
html/ops/manage_special_users.php | 6 +-
html/ops/manage_special_users_action.php | 2 +-
html/ops/size_census.php | 7 +-
html/user/create_profile.php | 24 +-
html/user/forum_report_post.php | 2 +-
html/user/user_permissions.php | 117 +
lib/common_defs.h | 5 +-
lib/filesys.cpp | 35 +-
lib/gui_rpc_client.cpp | 3 +
lib/prefs.cpp | 17 +-
lib/str_replace.h | 6 +-
locale/ca/BOINC-Manager.mo | Bin 76669 -> 79234 bytes
locale/ca/BOINC-Manager.po | 2878 +++++++++--------
locale/ca/BOINC-Project-Generic.po | 2 +-
locale/ca/BOINC-Web.mo | Bin 36923 -> 36904 bytes
locale/ca/BOINC-Web.po | 6 +-
locale/cs/BOINC-Project-Generic.po | 2 +-
locale/cs/BOINC-Setup.mo | Bin 3071 -> 3071 bytes
locale/cs/BOINC-Setup.po | 2 +-
locale/de/BOINC-Project-Generic.po | 3343 ++++++++++----------
locale/en/BOINC-Drupal.po | 1518 +++++++++
locale/en/BOINC-Manager.mo | Bin 75384 -> 73178 bytes
locale/en/BOINC-Manager.po | 1834 +++++------
locale/fr/BOINC-Client.mo | Bin 5005 -> 4996 bytes
locale/fr/BOINC-Client.po | 139 +-
locale/fr/BOINC-Manager.mo | Bin 83737 -> 81276 bytes
locale/fr/BOINC-Manager.po | 1824 +++++------
locale/fr/BOINC-Project-Generic.po | 3282 ++++++++++---------
locale/fr/BOINC-Setup.mo | Bin 3355 -> 3158 bytes
locale/fr/BOINC-Setup.po | 72 +-
locale/it_IT/BOINC-Manager.mo | Bin 81334 -> 78954 bytes
locale/it_IT/BOINC-Manager.po | 1832 +++++------
locale/it_IT/BOINC-Project-Generic.po | 4 +-
locale/it_IT/BOINC-Setup.mo | Bin 3028 -> 3009 bytes
locale/it_IT/BOINC-Setup.po | 6 +-
locale/ja/BOINC-Drupal.po | 176 ++
locale/ja/BOINC-Manager.mo | Bin 94173 -> 91374 bytes
locale/ja/BOINC-Manager.po | 1836 +++++------
locale/ja/BOINC-Project-Generic.po | 134 +-
locale/ka/BOINC-Client.mo | Bin 0 -> 7862 bytes
locale/ka/BOINC-Client.po | 162 +
locale/ka/BOINC-Setup.mo | Bin 0 -> 4823 bytes
locale/ka/BOINC-Setup.po | 118 +
locale/ko/BOINC-Drupal.po | 120 +
locale/ko/BOINC-Manager.mo | Bin 84499 -> 81851 bytes
locale/ko/BOINC-Manager.po | 1834 +++++------
locale/ko/BOINC-Project-Generic.po | 2 +-
locale/ko/BOINC-Web.mo | Bin 38750 -> 38731 bytes
locale/ko/BOINC-Web.po | 6 +-
locale/nl/BOINC-Web.mo | Bin 36961 -> 36942 bytes
locale/nl/BOINC-Web.po | 6 +-
locale/pt_PT/BOINC-Manager.mo | Bin 81599 -> 79161 bytes
locale/pt_PT/BOINC-Manager.po | 1944 ++++++------
locale/pt_PT/BOINC-Project-Generic.po | 3290 ++++++++++---------
locale/ro/BOINC-Setup.mo | Bin 3164 -> 3145 bytes
locale/ro/BOINC-Setup.po | 6 +-
locale/ru/BOINC-Drupal.po | 176 ++
locale/ru/BOINC-Manager.mo | Bin 108472 -> 105443 bytes
locale/ru/BOINC-Manager.po | 1836 +++++------
locale/ru/BOINC-Project-Generic.po | 4 +-
locale/ru/BOINC-Setup.mo | Bin 3890 -> 3890 bytes
locale/ru/BOINC-Setup.po | 2 +-
locale/ru/BOINC-Web.mo | Bin 50306 -> 50370 bytes
locale/ru/BOINC-Web.po | 4 +-
locale/sk/BOINC-Drupal.po | 1519 +++++++++
locale/sk/BOINC-Manager.mo | Bin 79904 -> 77639 bytes
locale/sk/BOINC-Manager.po | 1862 +++++------
locale/sk/BOINC-Project-Generic.po | 24 +-
locale/templates/BOINC-Drupal.pot | 2001 ++++++++++++
locale/templates/BOINC-Manager.pot | 2098 ++++++------
locale/tr/BOINC-Web.mo | Bin 36922 -> 36925 bytes
locale/tr/BOINC-Web.po | 8 +-
locale/uk/BOINC-Setup.mo | Bin 3890 -> 3871 bytes
locale/uk/BOINC-Setup.po | 6 +-
locale/uk/BOINC-Web.mo | Bin 49089 -> 49070 bytes
locale/uk/BOINC-Web.po | 6 +-
locale/zh_CN/BOINC-Drupal.po | 1432 +++++++++
locale/zh_CN/BOINC-Manager.mo | Bin 75519 -> 73359 bytes
locale/zh_CN/BOINC-Manager.po | 1835 +++++------
locale/zh_CN/BOINC-Project-Generic.po | 3301 ++++++++++---------
locale/zh_TW/BOINC-Manager.mo | Bin 73142 -> 73148 bytes
locale/zh_TW/BOINC-Manager.po | 4 +-
locale/zh_TW/BOINC-Web.mo | Bin 32720 -> 32720 bytes
locale/zh_TW/BOINC-Web.po | 2 +-
samples/example_app/MakeMacExample.sh | 2 +-
samples/example_app/Makefile_mac | 2 +
samples/example_app/Makefile_mac2 | 5 +-
samples/example_app/ReadMe.txt | 21 +
samples/gfx_html/browserctrl_win.cpp | 6 +-
samples/openclapp/Makefile_mac | 3 +
samples/openclapp/ReadMe.txt | 12 +-
samples/vboxwrapper/BuildMacVboxWrapper.sh | 6 +-
samples/vboxwrapper/Makefile | 7 +-
samples/vboxwrapper/Makefile_mac | 24 +-
samples/vboxwrapper/ReadMe.txt | 17 +
samples/vboxwrapper/vbox_common.cpp | 55 +
samples/vboxwrapper/vbox_common.h | 43 +-
samples/vboxwrapper/vbox_mscom_impl.cpp | 154 +-
samples/vboxwrapper/vbox_vboxmanage.cpp | 82 +-
samples/vboxwrapper/vboxlog.cpp | 31 -
samples/vboxwrapper/vboxlog.h | 21 -
samples/vboxwrapper/vboxwrapper.cpp | 40 +-
.../vboxwrapper.xcodeproj/project.pbxproj | 8 -
samples/wrapper/Makefile_mac | 5 +-
samples/wrapper/ReadMe.txt | 12 +
samples/wrapper/wrapper.cpp | 10 +-
sched/sched_assign.cpp | 5 +-
sched/sched_score.h | 6 +-
sched/validator.cpp | 12 +
tools/create_work.cpp | 9 +-
tools/make_project | 3 +-
version.h.in | 2 +-
zip/boinc_zip.xcodeproj/project.pbxproj | 28 +-
175 files changed, 26773 insertions(+), 19170 deletions(-)
diff --cc .gitignore
index 5f0cbd1,558a50e..f28c62f
--- a/.gitignore
+++ b/.gitignore
@@@ -149,11 -149,4 +149,12 @@@ tools/sign_executabl
vda/ssim
vda/vda
vda/vdad
+ /win_build/*.sdf
+
+
+#debian specific files
+.pc
+update-boinc-applinks.1
+
+# upstream files not here
+version.h
--
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