[boinc] 05/09: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-boinc/boinc
Steffen Möller
moeller at alioth.debian.org
Tue Nov 5 09:31:24 UTC 2013
This is an automated email from the git hooks/post-receive script.
moeller pushed a commit to branch master
in repository boinc.
commit 8ceef4700820f0c753f1656b0a251137712d8c49
Merge: 5f73ce9 2b36013
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Fri Oct 25 22:32:19 2013 +0200
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-boinc/boinc
android/BOINC/AndroidManifest.xml | 6 +-
android/BOINC/res/drawable-hdpi/mailb.png | Bin 0 -> 4101 bytes
android/BOINC/res/drawable-hdpi/tabtransfers.png | Bin 478 -> 0 bytes
android/BOINC/res/drawable-hdpi/tabtransfersb.png | Bin 451 -> 0 bytes
android/BOINC/res/drawable-ldpi/mailb.png | Bin 0 -> 3430 bytes
android/BOINC/res/drawable-ldpi/tabtransfers.png | Bin 341 -> 0 bytes
android/BOINC/res/drawable-ldpi/tabtransfersb.png | Bin 323 -> 0 bytes
android/BOINC/res/drawable-mdpi/mailb.png | Bin 0 -> 3672 bytes
android/BOINC/res/drawable-mdpi/tabtransfers.png | Bin 402 -> 0 bytes
android/BOINC/res/drawable-mdpi/tabtransfersb.png | Bin 399 -> 0 bytes
.../{icon_trans_tab.xml => icon_notices_tab.xml} | 4 +-
.../{trans_layout.xml => notices_layout.xml} | 4 +-
...ut_listitem.xml => notices_layout_listitem.xml} | 35 +-
.../BOINC/res/layout/projects_layout_listitem.xml | 20 +
android/BOINC/res/layout/trans_layout_listitem.xml | 110 -
.../res/layout/trans_layout_listitem_expansion.xml | 118 -
android/BOINC/res/values-da/strings.xml | 247 +-
android/BOINC/res/values-de/strings.xml | 226 +-
android/BOINC/res/values-el/strings.xml | 226 +-
android/BOINC/res/values-fi/strings.xml | 227 +-
android/BOINC/res/values-sk/strings.xml | 247 +-
android/BOINC/res/values-uk/strings.xml | 247 +-
android/BOINC/res/values-zh-rTW/strings.xml | 24 +-
android/BOINC/res/values/configuration.xml | 2 +-
android/BOINC/res/values/strings.xml | 4 +
.../src/edu/berkeley/boinc/BOINCActivity.java | 4 +-
.../src/edu/berkeley/boinc/NoticesActivity.java | 170 ++
.../src/edu/berkeley/boinc/ProjectsActivity.java | 54 +-
.../src/edu/berkeley/boinc/TransActivity.java | 360 ---
.../berkeley/boinc/adapter/NoticesListAdapter.java | 97 +
.../boinc/adapter/ProjectsListAdapter.java | 60 +
.../berkeley/boinc/adapter/TransListAdapter.java | 325 ---
.../edu/berkeley/boinc/client/ClientStatus.java | 26 +
.../src/edu/berkeley/boinc/client/Monitor.java | 6 +
.../src/edu/berkeley/boinc/rpc/NoticesParser.java | 6 +-
client/app_start.cpp | 1 +
client/gpu_detect.cpp | 13 +-
client/gpu_opencl.cpp | 2 +
client/sysmon_win.cpp | 10 +-
configure.ac | 2 +-
debian/changelog | 16 +
debian/control.in | 48 +-
debian/patches/addressing_addional_html_dirs.patch | 6 +-
debian/patches/boinclib_shared.patch | 4 +-
debian/patches/disable_silent_rules.patch | 2 +-
debian/patches/dynamic_libboinc.patch | 6 +-
.../file_upload_handler_in_sched_linking.patch | 6 +-
.../patches/gui_urls_xml_added_to_Makefile.patch | 6 +-
.../make_project_overcomes_Apache24_security.patch | 6 +-
.../nvidia_mem_display_simplification.patch | 4 +-
debian/rules | 2 +-
lib/app_ipc.cpp | 5 +
lib/app_ipc.h | 34 +-
lib/diagnostics.cpp | 8 +
lib/diagnostics.h | 1 +
lib/opencl_boinc.cpp | 12 +
lib/opencl_boinc.h | 8 +-
locale/bg/BOINC-Android.po | 115 +-
locale/bg/BOINC-Project-Generic.po | 3 +-
locale/ca/BOINC-Android.po | 119 +-
locale/cs/BOINC-Android.po | 122 +-
locale/da/BOINC-Android.po | 581 +++--
locale/da/BOINC-Client.mo | Bin 417 -> 4752 bytes
locale/da/BOINC-Client.po | 72 +-
locale/da/BOINC-Manager.mo | Bin 40195 -> 40880 bytes
locale/da/BOINC-Manager.po | 22 +-
locale/da/BOINC-Project-Generic.po | 12 +-
locale/da/BOINC-Setup.mo | Bin 554 -> 2882 bytes
locale/da/BOINC-Setup.po | 50 +-
locale/da/BOINC-Web.mo | Bin 684 -> 1348 bytes
locale/da/BOINC-Web.po | 30 +-
locale/de/BOINC-Android.po | 111 +-
locale/el/BOINC-Android.po | 113 +-
locale/es/BOINC-Android.po | 94 +-
locale/es/BOINC-Client.mo | Bin 4928 -> 4984 bytes
locale/es/BOINC-Client.po | 29 +-
locale/es/BOINC-Manager.mo | Bin 82943 -> 82932 bytes
locale/es/BOINC-Manager.po | 8 +-
locale/fi/BOINC-Android.po | 110 +-
locale/fr/BOINC-Android.po | 109 +-
locale/he/BOINC-Android.po | 94 +-
locale/hr/BOINC-Android.po | 97 +-
locale/hu/BOINC-Android.po | 125 +-
locale/hu/BOINC-Client.mo | Bin 4759 -> 5085 bytes
locale/hu/BOINC-Client.po | 9 +-
locale/hu/BOINC-Manager.mo | Bin 80105 -> 81144 bytes
locale/hu/BOINC-Manager.po | 22 +-
locale/hu/BOINC-Project-Generic.po | 28 +-
locale/hu/BOINC-Setup.mo | Bin 798 -> 955 bytes
locale/hu/BOINC-Setup.po | 6 +-
locale/hu/BOINC-Web.mo | Bin 31346 -> 31792 bytes
locale/hu/BOINC-Web.po | 22 +-
locale/it_IT/BOINC-Android.po | 110 +-
locale/ja/BOINC-Android.po | 94 +-
locale/ko/BOINC-Android.po | 100 +-
locale/lt/BOINC-Android.po | 96 +-
locale/lv/BOINC-Android.po | 95 +-
locale/nb/BOINC-Android.po | 94 +-
locale/nl/BOINC-Android.po | 102 +-
locale/pl/BOINC-Android.po | 96 +-
locale/pt_BR/BOINC-Android.po | 94 +-
locale/pt_PT/BOINC-Android.po | 108 +-
locale/ro/BOINC-Android.po | 117 +-
locale/ru/BOINC-Android.po | 121 +-
locale/sk/BOINC-Android.po | 580 +++--
locale/sl/BOINC-Android.po | 95 +-
locale/templates/BOINC-Android.pot | 80 +-
locale/tr/BOINC-Android.po | 110 +-
locale/uk/BOINC-Android.po | 278 ++-
locale/uk/BOINC-Manager.mo | Bin 108660 -> 108645 bytes
locale/uk/BOINC-Manager.po | 37 +-
locale/uk/BOINC-Project-Generic.po | 23 +-
locale/uk/BOINC-Setup.mo | Bin 3760 -> 3794 bytes
locale/uk/BOINC-Setup.po | 11 +-
locale/uk/BOINC-Web.mo | Bin 48050 -> 48058 bytes
locale/uk/BOINC-Web.po | 8 +-
locale/zh_CN/BOINC-Android.po | 666 ++++--
locale/zh_CN/BOINC-Setup.mo | Bin 2756 -> 2756 bytes
locale/zh_CN/BOINC-Setup.po | 2 +-
locale/zh_TW/BOINC-Android.po | 129 +-
samples/glut/Roman.stroke | 604 +++++
samples/glut/glut.h | 595 +++++
samples/glut/glut_roman.c | 2451 ++++++++++++++++++++
samples/glut/glut_stroke.c | 42 +
samples/glut/glut_swidth.c | 58 +
samples/glut/glutbitmap.h | 30 +
samples/glut/glutint.h | 24 +
samples/glut/glutstroke.h | 42 +
samples/glut/glutwin32.h | 18 +
samples/glut/stroke.h | 134 ++
samples/glut/win32_glx.c | 255 ++
samples/glut/win32_glx.h | 58 +
samples/glut/win32_util.c | 82 +
samples/glut/win32_x11.c | 401 ++++
samples/glut/win32_x11.h | 319 +++
135 files changed, 10491 insertions(+), 3028 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