Merge branch '5.1'
- Conflicts:
- languages/qmljs/kdevqmljs.json
Description
Description
Details
Details
- Committed
kossebau Feb 12 2017, 6:56 PM - Parents
- R32:121ce7a90305: Merge branch '5.0' into 5.1
R32:2b60043d7b2a: Fix crash with Memory Viewer enabled - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 121ce7a90305 | kossebau | Merge branch '5.0' into 5.1 | Feb 12 2017 | |||
| b2a27a23b8aa | D4582 | kossebau | C/C++ Compilers config page: use KUrlRequester, focus edit field on Add | Feb 12 2017 | ||
| db4e912c5fb8 | kossebau | C/C++ Compilers config page: ensure compiler list is shown expanded | Feb 12 2017 | |||
| 4274c9fe57dd | kossebau | Add missing explicit | Feb 12 2017 | |||
| aee7d8f76d48 | kossebau | Remove unused variable | Feb 12 2017 | |||
| f78d1bc6dfca | kossebau | Remove duplicated or'ed condition | Feb 12 2017 | |||
| dc16bb5bf50a | kossebau | QObject template: fix typo screwing redefinition of block extra_definitions | Feb 9 2017 | |||
| 2c1a1fd7f6f3 | kossebau | Tag kdevqmljs to also support pure "JavaScript" | Feb 8 2017 | |||
| 318f532e8c01 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Feb 7 2017 | |||
| 2f074d506a58 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Feb 4 2017 | |||
| 5bbd27d9757a | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Feb 3 2017 | |||
| 2c5b4f87d9f8 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Jan 30 2017 | |||
| d873c4ef1075 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Jan 28 2017 |