diff options
author | Graeme Geldenhuys <graemeg@gmail.com> | 2014-07-25 01:27:15 +0100 |
---|---|---|
committer | Graeme Geldenhuys <graemeg@gmail.com> | 2014-07-25 01:27:15 +0100 |
commit | 2266588694286ed74181ca3cf7d22127fc29e7f6 (patch) | |
tree | a06593198177e66f89210dd788fe42a0c0b46f51 /uidesigner | |
parent | 536bb20956573285c964c7eb66f34c9857d461da (diff) | |
parent | 2844077c0283f6d622fbdcddf2a356ee7ee1072f (diff) | |
download | fpGUI-2266588694286ed74181ca3cf7d22127fc29e7f6.tar.xz |
Merge branch 'release-1.2' into develop
This is so we can get the latest bug fixes from the release
branch.
Diffstat (limited to 'uidesigner')
0 files changed, 0 insertions, 0 deletions