[med-svn] [sleepyhead] 03/05: Merge tag 'upstream/1.0.0-beta-2+dfsg'

Sergio Durigan Junior sergiodj-guest at moszumanska.debian.org
Fri Apr 29 04:25:29 UTC 2016


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

sergiodj-guest pushed a commit to branch master
in repository sleepyhead.

commit 24ea81b46c169688f50abc5f0ec10cddfe580ff4
Merge: 2e67d4a 71676c5
Author: Sergio Durigan Junior <sergiodj at sergiodj.net>
Date:   Fri Apr 29 00:00:45 2016 -0400

    Merge tag 'upstream/1.0.0-beta-2+dfsg'
    
    Upstream version 1.0.0-beta-2+dfsg

 .gitignore                                         |   35 +
 README                                             |   38 +-
 SleepyHeadQT.pro                                   |    5 +-
 Translations/Bulgarian.bg.ts                       | 7669 +++++++++-------
 Translations/Chinese.zh.ts                         | 3414 +++----
 Translations/Deutsch.de.ts                         | 6230 ++++++-------
 Translations/English.en_UK.ts                      | 4733 ++++++----
 Translations/Espaniol.es.ts                        | 5533 ++++++------
 Translations/Francais.fr.ts                        | 6914 +++++++-------
 Translations/Nederlands.nl.ts                      | 9498 ++++++++------------
 Translations/{English.en_UK.ts => Portugues.pt.ts} | 5488 ++++++-----
 Translations/{Svenska.se.ts => Suomi.fi.ts}        | 9004 ++++++++++---------
 Translations/Svenska.se.ts                         | 6118 +++++++------
 history/cms50f/cms50f_duration_check.py            |   49 +
 history/cms50f/dump_cms50f37.py                    |  143 +
 sleepyhead/Graphs/MinutesAtPressure.cpp            |  788 +-
 sleepyhead/Graphs/MinutesAtPressure.h              |   57 +-
 sleepyhead/Graphs/gFlagsLine.cpp                   |    6 +-
 sleepyhead/Graphs/gFlagsLine.h                     |    4 +-
 sleepyhead/Graphs/gFooBar.cpp                      |    2 +-
 sleepyhead/Graphs/gFooBar.h                        |    2 +-
 sleepyhead/Graphs/gGraph.cpp                       |   66 +-
 sleepyhead/Graphs/gGraph.h                         |   12 +-
 sleepyhead/Graphs/gGraphView.cpp                   |  158 +-
 sleepyhead/Graphs/gGraphView.h                     |   20 +-
 sleepyhead/Graphs/gLineChart.cpp                   |   18 +-
 sleepyhead/Graphs/gLineChart.h                     |    6 +-
 sleepyhead/Graphs/gLineOverlay.cpp                 |   22 +-
 sleepyhead/Graphs/gLineOverlay.h                   |    2 +-
 sleepyhead/Graphs/gSegmentChart.cpp                |    2 +-
 sleepyhead/Graphs/gSegmentChart.h                  |    2 +-
 sleepyhead/Graphs/gSessionTimesChart.cpp           |   65 +-
 sleepyhead/Graphs/gSessionTimesChart.h             |    2 +-
 sleepyhead/Graphs/gStatsLine.h                     |    2 +-
 sleepyhead/Graphs/gSummaryChart.cpp                |   11 +-
 sleepyhead/Graphs/gSummaryChart.h                  |    2 +-
 sleepyhead/Graphs/gXAxis.cpp                       |   62 +-
 sleepyhead/Graphs/gXAxis.h                         |   47 +-
 sleepyhead/Graphs/gYAxis.cpp                       |   26 +-
 sleepyhead/Graphs/gYAxis.h                         |    2 +-
 sleepyhead/Graphs/gdailysummary.cpp                |    4 +-
 sleepyhead/Graphs/gdailysummary.h                  |    2 +-
 sleepyhead/Graphs/glcommon.cpp                     |    2 +-
 sleepyhead/Graphs/glcommon.h                       |    2 +-
 sleepyhead/Graphs/gspacer.cpp                      |    2 +-
 sleepyhead/Graphs/gspacer.h                        |    2 +-
 sleepyhead/Graphs/layer.cpp                        |    2 +-
 sleepyhead/Graphs/layer.h                          |    2 +-
 sleepyhead/Resources.qrc                           |    4 +
 sleepyhead/SleepLib/calcs.cpp                      |  257 +-
 sleepyhead/SleepLib/calcs.h                        |    2 +-
 sleepyhead/SleepLib/common.cpp                     |   27 +-
 sleepyhead/SleepLib/common.h                       |   20 +-
 sleepyhead/SleepLib/day.cpp                        |   16 +-
 sleepyhead/SleepLib/day.h                          |    2 +-
 sleepyhead/SleepLib/event.cpp                      |    4 +-
 sleepyhead/SleepLib/event.h                        |    2 +-
 sleepyhead/SleepLib/journal.cpp                    |    2 +-
 sleepyhead/SleepLib/journal.h                      |    2 +-
 .../SleepLib/loader_plugins/cms50_loader.cpp       |    2 +
 sleepyhead/SleepLib/loader_plugins/cms50_loader.h  |    2 +-
 .../SleepLib/loader_plugins/cms50f37_loader.cpp    |   20 +-
 .../SleepLib/loader_plugins/cms50f37_loader.h      |    2 +-
 sleepyhead/SleepLib/loader_plugins/icon_loader.cpp |   21 +-
 sleepyhead/SleepLib/loader_plugins/icon_loader.h   |    2 +-
 .../SleepLib/loader_plugins/intellipap_loader.cpp  |   40 +-
 .../SleepLib/loader_plugins/intellipap_loader.h    |    2 +-
 .../SleepLib/loader_plugins/md300w1_loader.cpp     |    2 +-
 .../SleepLib/loader_plugins/md300w1_loader.h       |    2 +-
 .../SleepLib/loader_plugins/mseries_loader.cpp     |   21 +-
 .../SleepLib/loader_plugins/mseries_loader.h       |    2 +-
 sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp | 1372 ++-
 sleepyhead/SleepLib/loader_plugins/prs1_loader.h   |   46 +-
 .../SleepLib/loader_plugins/resmed_loader.cpp      |  487 +-
 sleepyhead/SleepLib/loader_plugins/resmed_loader.h |    6 +-
 .../SleepLib/loader_plugins/somnopose_loader.cpp   |    5 +-
 .../SleepLib/loader_plugins/somnopose_loader.h     |    2 +-
 .../SleepLib/loader_plugins/weinmann_loader.cpp    |   30 +-
 .../SleepLib/loader_plugins/weinmann_loader.h      |    2 +-
 sleepyhead/SleepLib/loader_plugins/zeo_loader.cpp  |   42 +-
 sleepyhead/SleepLib/loader_plugins/zeo_loader.h    |    2 +-
 sleepyhead/SleepLib/machine.cpp                    |   11 +-
 sleepyhead/SleepLib/machine.h                      |    2 +-
 sleepyhead/SleepLib/machine_common.cpp             |    8 +-
 sleepyhead/SleepLib/machine_common.h               |   10 +-
 sleepyhead/SleepLib/machine_loader.cpp             |    2 +-
 sleepyhead/SleepLib/preferences.cpp                |   14 +-
 sleepyhead/SleepLib/profiles.cpp                   |   46 +-
 sleepyhead/SleepLib/profiles.h                     |   31 +-
 sleepyhead/SleepLib/progressdialog.cpp             |    2 +-
 sleepyhead/SleepLib/progressdialog.h               |    2 +-
 sleepyhead/SleepLib/schema.cpp                     |  226 +-
 sleepyhead/SleepLib/schema.h                       |    9 +-
 sleepyhead/SleepLib/serialoximeter.cpp             |    2 +-
 sleepyhead/SleepLib/serialoximeter.h               |    2 +-
 sleepyhead/SleepLib/session.cpp                    |   37 +-
 sleepyhead/SleepLib/session.h                      |    4 +-
 sleepyhead/UpdaterWindow.cpp                       |  321 +-
 sleepyhead/UpdaterWindow.h                         |    9 +-
 sleepyhead/build_number.h                          |    2 +-
 sleepyhead/common_gui.cpp                          |    2 +-
 sleepyhead/common_gui.h                            |    2 +-
 sleepyhead/daily.cpp                               |   54 +-
 sleepyhead/daily.h                                 |    4 +-
 sleepyhead/daily.ui                                |    4 +-
 sleepyhead/docs/changelog.txt                      |    1 -
 sleepyhead/docs/channels.xml                       |   39 -
 sleepyhead/docs/release_notes.html                 |   95 +-
 sleepyhead/exportcsv.cpp                           |    2 +-
 sleepyhead/exportcsv.h                             |    2 +-
 sleepyhead/icons/Jedimark.png                      |  Bin 166828 -> 148977 bytes
 sleepyhead/icons/aircurve.png                      |  Bin 0 -> 47747 bytes
 sleepyhead/icons/airsense10.png                    |  Bin 0 -> 74228 bytes
 sleepyhead/icons/arrow-end.png                     |  Bin 9026 -> 3102 bytes
 sleepyhead/icons/arrow-left.png                    |  Bin 8017 -> 2242 bytes
 sleepyhead/icons/arrow-right.png                   |  Bin 8008 -> 2208 bytes
 sleepyhead/icons/back.png                          |  Bin 2952 -> 3014 bytes
 sleepyhead/icons/bob-v3.0.png                      |  Bin 30302 -> 31322 bytes
 sleepyhead/icons/bookmark.png                      |  Bin 1226 -> 1498 bytes
 sleepyhead/icons/cms50f.png                        |  Bin 85294 -> 71297 bytes
 sleepyhead/icons/cubeoximeter.png                  |  Bin 42705 -> 43146 bytes
 sleepyhead/icons/dreamstation.png                  |  Bin 0 -> 54976 bytes
 sleepyhead/icons/edit-find.png                     |  Bin 68710 -> 69443 bytes
 sleepyhead/icons/eye.png                           |  Bin 38699 -> 39616 bytes
 sleepyhead/icons/forward.png                       |  Bin 2983 -> 3068 bytes
 sleepyhead/icons/fp_icon.png                       |  Bin 0 -> 74355 bytes
 sleepyhead/icons/go-home.png                       |  Bin 2458 -> 2629 bytes
 sleepyhead/icons/help.png                          |  Bin 82459 -> 84899 bytes
 sleepyhead/icons/intellipap.png                    |  Bin 96431 -> 79080 bytes
 sleepyhead/icons/last.png                          |  Bin 390 -> 322 bytes
 sleepyhead/icons/mask.png                          |  Bin 64178 -> 40437 bytes
 sleepyhead/icons/moon.png                          |  Bin 4948 -> 5052 bytes
 sleepyhead/icons/overview.png                      |  Bin 50971 -> 52203 bytes
 sleepyhead/icons/oximeter.png                      |  Bin 42402 -> 42849 bytes
 sleepyhead/icons/preferences.png                   |  Bin 3704 -> 3833 bytes
 sleepyhead/icons/prs1.png                          |  Bin 75569 -> 61965 bytes
 sleepyhead/icons/prs1_60s.png                      |  Bin 81511 -> 67901 bytes
 sleepyhead/icons/prs1_960.png                      |  Bin 0 -> 46409 bytes
 sleepyhead/icons/pushpin.png                       |  Bin 2050 -> 2127 bytes
 sleepyhead/icons/refresh.png                       |  Bin 815 -> 936 bytes
 sleepyhead/icons/rms9.png                          |  Bin 76421 -> 64660 bytes
 sleepyhead/icons/sadface.png                       |  Bin 70604 -> 44794 bytes
 sleepyhead/icons/save.png                          |  Bin 3612 -> 3859 bytes
 sleepyhead/icons/sdcard-lock.png                   |  Bin 80327 -> 81708 bytes
 sleepyhead/icons/sdcard.png                        |  Bin 68397 -> 70156 bytes
 sleepyhead/icons/session-off.png                   |  Bin 1350 -> 177 bytes
 sleepyhead/icons/session-on.png                    |  Bin 1352 -> 176 bytes
 sleepyhead/icons/smileyface.png                    |  Bin 77133 -> 48623 bytes
 sleepyhead/icons/statistics.png                    |  Bin 49803 -> 47469 bytes
 sleepyhead/icons/trophy.png                        |  Bin 15460 -> 15739 bytes
 sleepyhead/logger.cpp                              |    2 +-
 sleepyhead/main.cpp                                |  198 +-
 sleepyhead/mainwindow.cpp                          |  212 +-
 sleepyhead/mainwindow.h                            |   35 +-
 sleepyhead/mainwindow.ui                           |   54 +-
 sleepyhead/newprofile.cpp                          |    6 +-
 sleepyhead/newprofile.h                            |    2 +-
 sleepyhead/newprofile.ui                           |    4 +-
 sleepyhead/overview.cpp                            |    7 +-
 sleepyhead/overview.h                              |    2 +-
 sleepyhead/oximeterimport.cpp                      |   19 +-
 sleepyhead/oximeterimport.h                        |    4 +-
 sleepyhead/oximeterimport.ui                       |    8 +-
 sleepyhead/preferencesdialog.cpp                   |   71 +-
 sleepyhead/preferencesdialog.h                     |    8 +-
 sleepyhead/preferencesdialog.ui                    | 1774 ++--
 sleepyhead/profileselect.cpp                       |   15 +-
 sleepyhead/profileselect.h                         |    2 +-
 sleepyhead/reports.cpp                             |  129 +-
 sleepyhead/reports.h                               |    2 +-
 sleepyhead/scripts/build_number                    |    2 +-
 sleepyhead/scripts/fetchUpstream.sh                |    4 +
 sleepyhead/sessionbar.h                            |    2 +-
 sleepyhead/sleepyhead.pro                          |   30 +-
 sleepyhead/statistics.cpp                          |  222 +-
 sleepyhead/statistics.h                            |    2 +-
 sleepyhead/translation.cpp                         |   10 +-
 sleepyhead/translation.h                           |    4 +-
 sleepyhead/updateparser.cpp                        |  116 +-
 sleepyhead/updateparser.h                          |   64 +-
 sleepyhead/version.h                               |   18 +-
 sleepyhead/welcome.cpp                             |    2 +-
 182 files changed, 37860 insertions(+), 34840 deletions(-)

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



More information about the debian-med-commit mailing list