Merge branch 'master' of git://gitorious.org/fg/fgdata
authorsyd <adams.syd@gmail.com>
Tue, 13 Dec 2011 15:49:37 +0000 (08:49 -0700)
committersyd <adams.syd@gmail.com>
Tue, 13 Dec 2011 15:49:37 +0000 (08:49 -0700)
commitea2374f3a1176130b52c68909519dba7167209b7
tree4a1be9ffe49a1f6f0103b46d246269bda666f2a9
parent2e6985f18897aef82119b1c0fc6feabeeb7be929
parentd14f25f4c65fd09606196619d0e9c795b01d2ea2
Merge branch 'master' of git://gitorious.org/fg/fgdata

Conflicts:
Aircraft/R22/Models/Effects/skin-reflect.eff
Aircraft/R22/Models/Effects/skin-reflect.eff