Merge with 4e0f46f25a716ac65a4016bac6284685147b5ec9
(note: color.cc is still in the source tree and CMakeLists.txt)
Before Width: | Height: | Size: 508 B |
Before Width: | Height: | Size: 632 B |
Before Width: | Height: | Size: 501 B |
Before Width: | Height: | Size: 623 B |
Before Width: | Height: | Size: 489 B |
Before Width: | Height: | Size: 610 B |
Before Width: | Height: | Size: 495 B |
Before Width: | Height: | Size: 613 B |