chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into deprecate-series

Browse Source
This commit is contained in:
sawinglogz 2019-08-18 17:38:48 -04:00
commit bed88b1546
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oscar/Resources.qrc
View File

@ -57,19 +57,5 @@
<file>icons/dv64.png</file> <file>icons/dv64.png</file>
<file>icons/overview-page.png</file> <file>icons/overview-page.png</file>
<file>icons/fp_icon.png</file> <file>icons/fp_icon.png</file>
<file>translations/Afrikaans.af.qm</file>
<file>translations/Arabic.ar.qm</file>
<file>translations/Bulgarian.bg.qm</file>
<file>translations/Chinese.zh.qm</file>
<file>translations/Deutsch.de.qm</file>
<file>translations/English.en_UK.qm</file>
<file>translations/Espaniol.es.qm</file>
<file>translations/Francais.fr.qm</file>
<file>translations/Greek.el.qm</file>
<file>translations/Italiano.it.qm</file>
<file>translations/Nederlands.nl.qm</file>
<file>translations/Portugues.pt.qm</file>
<file>translations/Suomi.fi.qm</file>
<file>translations/Svenska.se.qm</file>
</qresource> </qresource>
</RCC> </RCC>

2
oscar/docs/release_notes.html
View File

@ -12,7 +12,9 @@ Which was written and copyright 2011-2018 &copy; Mark Watkins
<li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li> <li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
<li>[new] Windows installers support Oscar, Oscar 32-bit, Oscar (test) and Oscar 32-bit (test)</li> <li>[new] Windows installers support Oscar, Oscar 32-bit, Oscar (test) and Oscar 32-bit (test)</li>
<li>[fix] Release builds use a Settings key of OSCAR, Test builds use OSCAR-test, and Branch builds use OSCAR-branch. Default data directories are similarly named.</li> <li>[fix] Release builds use a Settings key of OSCAR, Test builds use OSCAR-test, and Branch builds use OSCAR-branch. Default data directories are similarly named.</li>
<li>[fix] All languages now available on Mac</li>
<li>[fix] Date bar on bottom of Daily graph now in local time when no line cursor displayed, and formatting improved</li> <li>[fix] Date bar on bottom of Daily graph now in local time when no line cursor displayed, and formatting improved</li>
<li>[fix] 100% zoom now works on overview page</li>
<li>[fix] View/Reset Graphs now enables all graphs and all event flags</li> <li>[fix] View/Reset Graphs now enables all graphs and all event flags</li>
<li>[fix] Calendar date now formatted per national settings</li> <li>[fix] Calendar date now formatted per national settings</li>
</ul> </ul>