openmct/platform/commonUI/edit/res/templates
Victor Woeltjen ee04814f59 Merge remote-tracking branch 'nasa/open1002' into open1015
Merge in open1002, WTD-1015.

Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html
2015-03-12 11:32:17 -07:00
..
edit-action-buttons.html [Common UI] Initial commonUI bundles 2014-11-23 15:41:20 -08:00
edit-object.html Merge remote-tracking branch 'nasa/open1002' into open1015 2015-03-12 11:32:17 -07:00
edit.html [Common UI] Initial commonUI bundles 2014-11-23 15:41:20 -08:00
elements.html [Common UI] Initial commonUI bundles 2014-11-23 15:41:20 -08:00
library.html [Common UI] Initial commonUI bundles 2014-11-23 15:41:20 -08:00
topbar-edit.html [Layout] Use refactored switcher in Edit 2014-12-04 12:32:35 -08:00