Avamander
|
aba3d65e3a
|
Merge remote-tracking branch 'origin-origin/patch-3'
# Conflicts:
# src/systemtask/SystemTask.cpp
|
2020-10-04 16:23:13 +03:00 |
|
|
Avamander
|
77f4d5448b
|
Fixed a small warning with Screen's constructor
|
2020-10-04 15:14:09 +03:00 |
|
|
Avamander
|
1d96758acd
|
Minor #include improvements
|
2020-10-04 15:11:21 +03:00 |
|
|
Avamander
|
13da1e38f0
|
Switched from NULL to nullptr
|
2020-10-04 14:53:11 +03:00 |
|
|
Avamander
|
6c86d1d9d7
|
Fixed all the includes that were broken due to the renames
|
2020-10-02 22:16:48 +03:00 |
|
|
Avamander
|
4daab26926
|
Renamed displayapp/Screens to displayapp/screens
|
2020-10-02 21:49:55 +03:00 |
|
|
Avamander
|
e3fb2f0b89
|
Renamed DisplayApp/ to displayapp/
|
2020-10-02 21:46:41 +03:00 |
|