Merge branch 'master' into rempt/T379-resource-management
Description
Description
Details
Details
- Committed
rempt Jun 5 2019, 1:43 PM - Parents
- R37:569bd6c99fd1: Merge branch 'master' into rempt/T379-resource-management
R37:3381c656e36d: Our hacking file says we don't use Q_NULLPTR, so let's not use it - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 3381c656e36d | rempt | Our hacking file says we don't use Q_NULLPTR, so let's not use it | Jun 5 2019 | |||
| 04d12bb3793f | jriddell | Revert "use the id used to launch it else it wont launch" | Jun 5 2019 |