Merge branch 'master' into travis

This commit is contained in:
Simon Detheridge
2015-07-22 14:14:37 +01:00
30 changed files with 1889 additions and 816 deletions

View File

@ -52,5 +52,6 @@ HEADERS += \
../../../Source/Ember/Variations05.h \
../../../Source/Ember/VariationsDC.h \
../../../Source/Ember/Xform.h \
../../../Source/Ember/XmlToEmber.h
../../../Source/Ember/XmlToEmber.h \
../../../Source/Ember/EmberMotion.h