Charles Hacskaylo c699cb8b4b Merge remote-tracking branch 'origin/master' into open933-c ... # Conflicts: # platform/commonUI/edit/res/templates/create/create-menu.html # platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot # platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg # platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf # platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff # platform/commonUI/general/res/sass/_archetypes.scss # platform/commonUI/general/res/sass/_constants.scss # platform/commonUI/general/res/sass/_icons.scss # platform/commonUI/general/res/sass/_main.scss # platform/commonUI/general/res/sass/_mixins.scss # platform/commonUI/general/res/sass/controls/_buttons.scss # platform/commonUI/general/res/templates/controls/time-controller.html # platform/commonUI/themes/snow/res/sass/_constants.scss		2016-08-01 17:11:37 -07:00
..
elements	[Documentation] Updated copyright statement. Fixes #1081	2016-07-12 16:55:57 -07:00
fixed.html	[Documentation] Updated copyright statement. Fixes #1081	2016-07-12 16:55:57 -07:00
frame.html	[Documentation] Updated copyright statement. Fixes #1081	2016-07-12 16:55:57 -07:00
layout.html	Merge remote-tracking branch 'origin/master' into open933-c	2016-08-01 17:11:37 -07:00