Merge branch 'master' into frameworks
Conflicts:
CMakeLists.txt
src/util/helpers.cpp
Description
Description
Details
Details
- Committed
stikonas Jul 24 2014, 7:56 AM - Parents
- R17:9026bebc2d61: Fix build with udisks1.
R17:1bab2bfab659: SVN_SILENT made messages (.desktop file) - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 1bab2bfab659 | l10n daemon script | SVN_SILENT made messages (.desktop file) | Jul 7 2014 | |||
| 0137c85bf9d2 | l10n daemon script | SVN_SILENT made messages (after extraction) | Jul 7 2014 | |||
| 5447297f06e2 | stikonas | Bump version number to 1.1.0 | Jul 6 2014 | |||
| 0769c0b6b984 | l10n daemon script | SVN_SILENT made messages (after extraction) | Jul 6 2014 | |||
| ee272cb91270 | l10n daemon script | SVN_SILENT made messages (after extraction) | Jul 5 2014 | |||
| 4cfd6af80423 | l10n daemon script | SVN_SILENT made messages (after extraction) | Jul 3 2014 |