Merge branch 'master' of git://gitorious.org/fg/fgdata
authorAlexis Bory <alexis@duck.(none)>
Sat, 9 Oct 2010 22:38:53 +0000 (00:38 +0200)
committerAlexis Bory <alexis@duck.(none)>
Sat, 9 Oct 2010 22:38:53 +0000 (00:38 +0200)
commit7d397efa504cbe76626f104003ebe8be3d0d3a43
treeb6629cb62c492adfda84f1d93550d8defe69ee45
parent18af8cc4fa046e6ef16e88c67dfb886352a971cd
parent80e15409480683515ddd99d0459f0d6d9db25de3
Merge branch 'master' of git://gitorious.org/fg/fgdata

Conflicts:
AI/Aircraft/A-10/Models/A-10.xml
preferences.xml
preferences.xml