Tim Moore
11479cd8c3
Merge branch 'ehofman/sound'
2010-01-16 23:49:36 +01:00
Tim Moore
430c60ed1a
Merge branch 'ehofman/sound'
2010-01-13 07:57:35 +01:00
Tim Moore
dfea3623f6
Merge branch 'tat/framework'
2010-01-13 07:57:30 +01:00
Tim Moore
b38783e4cb
Merge branch 'ehofman/subsys'
2010-01-11 07:15:11 +01:00
Tim Moore
9382a4c21b
Merge branch 'jester/aptsign'
2010-01-11 07:14:51 +01:00
Tim Moore
3cd4c5566f
Merge branch 'timoore/effects'
2010-01-11 07:14:23 +01:00
Tim Moore
601c0977df
Merge branch 'jmt/geodistance'
2010-01-11 07:10:46 +01:00
Tim Moore
d6c0bf69b6
fix up some merge weirdness
2010-01-01 13:32:03 +01:00
Tim Moore
dca07c5634
Merge branch 'timoore/effects'
...
Conflicts:
simgear/scene/model/model.cxx
simgear/scene/sky/newcloud.cxx
2009-12-20 16:07:00 +01:00
Tim Moore
fd42294faf
Merge branch 'ehofman/sound'
...
Changed include of SGQuat.hxx to SGMath.hxx in
sound/sample_openal.cxx; somehow this happened in a merge commit when
the sound branch was merged to next.
2009-12-20 11:46:28 +01:00
Tim Moore