Avamander
|
aba3d65e3a
|
Merge remote-tracking branch 'origin-origin/patch-3'
# Conflicts:
# src/systemtask/SystemTask.cpp
|
2020-10-04 16:23:13 +03:00 |
|
|
Avamander
|
9b7ba7b5b8
|
Fixed a typo in SystemTask
|
2020-10-04 15:13:01 +03:00 |
|
|
Avamander
|
1d96758acd
|
Minor #include improvements
|
2020-10-04 15:11:21 +03:00 |
|
|
Avamander
|
e85d1ffc62
|
Replaced NULL with nullptr
|
2020-10-04 15:09:17 +03:00 |
|
|
Avamander
|
6c86d1d9d7
|
Fixed all the includes that were broken due to the renames
|
2020-10-02 22:16:48 +03:00 |
|
|
Avamander
|
e25c4edbcf
|
Renamed SystemTask/ to systemtask/
|
2020-10-02 21:45:21 +03:00 |
|