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 |
|
Henry
|
a4f6f6f50b
|
Added license
|
2016-07-25 12:09:23 -04:00 |
|
Henry
|
c8898ac6aa
|
[Documentation] Updated copyright statement. Fixes #1081
|
2016-07-12 16:55:57 -07:00 |
|
Henry
|
088416905d
|
Added duration
|
2016-07-12 10:08:08 -07:00 |
|
Victor Woeltjen
|
ac5ac8d34e
|
[Build] Remove boilerplate from scripts
No longer necessary after JSHint configuration.
|
2016-03-04 10:46:38 -08:00 |
|
Henry
|
3e7eb11d84
|
Regenerated bundles
|
2016-01-14 17:08:19 -08:00 |
|