Merge branch 'master' into histogram_chart
Description
Description
Details
Details
- Committed
sgerlach Apr 22 2017, 10:57 AM - Parents
- R262:cdc460cf3872: fixed merge conflicts
R262:01f909b5659b: Merge branch 'frameworks' into histogram_chart - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| cdc460cf3872 | sgerlach | fixed merge conflicts | Apr 22 2017 | |||
| ccb374244e57 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Apr 20 2017 | |||
| ee1a1c0aba4c | l10n daemon script | GIT_SILENT made messages (after extraction) | Apr 20 2017 | |||
| 7140e5bc8c27 | sgerlach | simplified finding pics | Apr 2 2017 | |||
| bbe2dd817bc8 | asemke | Properly initialize the fit parameters on initial load. | Apr 1 2017 | |||
| d0146e7f16e4 | asemke | Properly update the curve when changing some of its properties. | Apr 1 2017 |