Victor Woeltjen 98caa31d7b Merge branch 'open877' into open879 ...

Merge fixed position view work and general toolbar
work to begin adding toolbars for fixed position view,
WTD-879."

Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html

2015-02-17 15:58:36 -08:00

..

edit-action-buttons.html

[Common UI] Initial commonUI bundles

2014-11-23 15:41:20 -08:00

edit-object.html

Merge branch 'open877' into open879

2015-02-17 15:58:36 -08: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