UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolved conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2019-12-24 01:07:22 +01:00
parent ce621f0a1b 588c05f6b4
commit a159d80b1c
62 changed files with 478 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kandinsky/include/kandinsky/color.h
View File

@@ -46,5 +46,6 @@ constexpr KDColor KDColorGreen = KDColor::RGB24(0x00FF00);
constexpr KDColor KDColorBlue = KDColor::RGB24(0x0000FF);
constexpr KDColor KDColorYellow = KDColor::RGB24(0xFFFF00);
constexpr KDColor KDColorOrange = KDColor::RGB24(0xFF9900);
constexpr KDColor KDColorPurple = KDColor::RGB24(0xFF00DD);
#endif