Merge branch '5.1'
- Conflicts:
- app/main.cpp
Description
Description
Details
Details
- Committed
kossebau Apr 27 2017, 2:37 PM - Parents
- R32:51bca25e3072: Remove outdated TODO
R32:723b09d085c7: Merge remote-tracking branch 'origin/5.1' - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 51bca25e3072 | kossebau | Remove outdated TODO | Apr 27 2017 | |||
| 0d56bd9abd09 | kossebau | Set app window icon for desktop file-ignorant shells | Apr 27 2017 | |||
| 5d068bc7a690 | D5598 | kossebau | Create KAboutData object only after QApp instance, for working translations | Apr 27 2017 |