Merge remote-tracking branch 'origin/1.6'
Conflicts:
CMakeLists.txt
Description
Description
Details
Details
- Committed
kfunk Nov 27 2013, 1:40 PM - Parents
- R32:1b296ddb507c: SVN_SILENT made messages (.desktop file)
R32:9f648f7f33b8: Fix version, reset to 1.6.60 in master - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 1b296ddb507c | l10n daemon script | SVN_SILENT made messages (.desktop file) | Nov 27 2013 | |||
| e9392dd7f29a | mwolff | Set version to 1.5.90 for 1.6 RC1 | Nov 26 2013 | |||
| 1d1dadab2fa6 | l10n daemon script | SVN_SILENT made messages (.desktop file) | Nov 26 2013 | |||
| 9ec4098efaf8 | l10n daemon script | SVN_SILENT made messages (.desktop file) | Nov 24 2013 | |||
| eb203ecbcf62 | l10n daemon script | SVN_SILENT made messages (.desktop file) | Nov 23 2013 | |||
| 6b7972095c40 | mwolff | Preallocate containers to size of return value. | Nov 22 2013 | |||
| 487bd6cc084e | mwolff | Cleanup includes. | Nov 21 2013 | |||
| a17f838595cd | mwolff | Give file-local linkage to comparison function. | Nov 21 2013 | |||
| fa9e13fa5bbe | kfunk | Fix assert in projectcontroller.cpp | Nov 21 2013 |