diff options
| author | Graeme Geldenhuys <graemeg@gmail.com> | 2014-07-27 00:46:17 +0100 |
|---|---|---|
| committer | Graeme Geldenhuys <graemeg@gmail.com> | 2014-07-27 00:46:17 +0100 |
| commit | 99aaeaa069f848a90751dbd112a2fc77c45a81ee (patch) | |
| tree | 3c148ea23933a64e4b7b80859ff0cd8199326ad4 /docs/colors/namedcolors.txt | |
| parent | b01b72f0886583100830cb42e2001d477f22976d (diff) | |
| parent | cc7e8f55c4fc4eb47f910be7d77d101a2012b566 (diff) | |
| download | fpGUI-99aaeaa069f848a90751dbd112a2fc77c45a81ee.tar.xz | |
Merge branch 'release-1.2' into develop
So we can get the latest bug fixes into 'develop'.
Diffstat (limited to 'docs/colors/namedcolors.txt')
0 files changed, 0 insertions, 0 deletions