Merge branch 'faitriangle' of git://github.com/TobiasLohner/XCSoar
commit5ed5d693b2ff3250de4a40925b71a7686b871b01
authorMax Kellermann <max@duempel.org>
Sat, 13 Apr 2013 07:28:47 +0000 (13 09:28 +0200)
committerMax Kellermann <max@duempel.org>
Sat, 13 Apr 2013 07:28:47 +0000 (13 09:28 +0200)
tree57ffe2360b074a54661c3fd8c352b7de2c4735d3
parent119a01f8772795da59c242219bb20ab5a58ecccd
parent9a8c36bcaeb0bf9de8c4e6eb8fdefc197a076331
Merge branch 'faitriangle' of git://github.com/TobiasLohner/XCSoar