summaryrefslogtreecommitdiff
path: root/languages
diff options
context:
space:
mode:
authorGraeme Geldenhuys <graemeg@gmail.com>2014-07-27 00:46:17 +0100
committerGraeme Geldenhuys <graemeg@gmail.com>2014-07-27 00:46:17 +0100
commit99aaeaa069f848a90751dbd112a2fc77c45a81ee (patch)
tree3c148ea23933a64e4b7b80859ff0cd8199326ad4 /languages
parentb01b72f0886583100830cb42e2001d477f22976d (diff)
parentcc7e8f55c4fc4eb47f910be7d77d101a2012b566 (diff)
downloadfpGUI-99aaeaa069f848a90751dbd112a2fc77c45a81ee.tar.xz
Merge branch 'release-1.2' into develop
So we can get the latest bug fixes into 'develop'.
Diffstat (limited to 'languages')
0 files changed, 0 insertions, 0 deletions