Victor Woeltjen dbe1875e70 [Themes] Resolve conflicts ...

Resolve conflicts in preparation for merge, nasa/openmctweb#118

2015-09-22 16:12:44 -07:00

..

button.html

[Frontend] Significant re-factoring of CSS and markup

2015-09-02 18:02:58 -07:00

checkbox.html

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

color.html

[Frontend] Significant re-factoring of CSS and markup

2015-09-02 18:02:58 -07:00

composite.html

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

datetime.html

[Forms] Use MM-DD in date-time control

2015-06-15 13:01:43 -07:00

dialog.html

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

menu-button.html

[Frontend] Significant re-factoring of CSS and markup

2015-09-02 18:02:58 -07:00

select.html

[Forms] Fix select control

2015-09-16 12:23:26 -07:00

textfield.html

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00