Merge pull request #1244 from nasa/restore-fixed-pos

[API] Enable fixed position view
This commit is contained in:
Victor Woeltjen 2016-10-18 09:32:08 -07:00 committed by GitHub
commit 8878ea4cf7

View File

@ -66,6 +66,7 @@ define([
'../platform/exporters/bundle', '../platform/exporters/bundle',
'../platform/features/clock/bundle', '../platform/features/clock/bundle',
'../platform/features/conductor/bundle', '../platform/features/conductor/bundle',
'../platform/features/fixed/bundle',
'../platform/features/conductor-v2/conductor/bundle', '../platform/features/conductor-v2/conductor/bundle',
'../platform/features/conductor-v2/compatibility/bundle', '../platform/features/conductor-v2/compatibility/bundle',
'../platform/features/conductor-v2/utcTimeSystem/bundle', '../platform/features/conductor-v2/utcTimeSystem/bundle',
@ -114,6 +115,7 @@ define([
'platform/exporters', 'platform/exporters',
'platform/telemetry', 'platform/telemetry',
'platform/features/clock', 'platform/features/clock',
'platform/features/fixed',
'platform/features/imagery', 'platform/features/imagery',
'platform/features/layout', 'platform/features/layout',
'platform/features/pages', 'platform/features/pages',