openmct/platform/features/layout/test
Victor Woeltjen a49deb5ab1 Merge remote-tracking branch 'github/master' into open116
Merge in latest from master into topic branch for
https://github.com/nasa/openmctweb/issues/116

Conflicts:
	platform/features/layout/test/FixedControllerSpec.js
	platform/features/plot/test/PlotControllerSpec.js
2015-12-30 10:15:05 -08:00
..
elements [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
FixedControllerSpec.js Merge remote-tracking branch 'github/master' into open116 2015-12-30 10:15:05 -08:00
FixedDragHandleSpec.js [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
FixedProxySpec.js [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
LayoutCompositionPolicySpec.js [Layout] Disallow folders 2015-06-27 12:43:32 -07:00
LayoutControllerSpec.js [Layout] Update raw positions on drop 2015-12-08 15:08:30 -08:00
LayoutDragSpec.js [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
suite.json [Layout] Disallow folders 2015-06-27 12:43:32 -07:00