Charles Hacskaylo 6868bfd4e1 [Merge] Resolve conflicts in open155
open #155

Conflicts:
	platform/commonUI/general/res/sass/user-environ/_layout.scss
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
	platform/commonUI/themes/snow/res/sass/_constants.scss
2015-10-26 13:20:26 -07:00

382 B

Provides the time conductor, a control which appears at the bottom of the screen allowing telemetry start and end times to be modified.

Note that the term "time controller" is generally preferred outside of the code base (e.g. in UI documents, issues, etc.); the term "time conductor" is being used in code to avoid confusion with "controllers" in the Model-View-Controller sense.