Merge branch 'develop' into clipping

This commit is contained in:
kekee000 2015-01-13 00:02:30 +08:00
commit e38a7eac0e
2 changed files with 2 additions and 2 deletions

View File

@ -9,7 +9,7 @@
define(
function(require) {
var svg2contours = require('ttf/util/svg2contours');
var svg2contours = require('ttf/svg/path2contours');
var contour2svg = require('ttf/util/contour2svg');
var getArc = require('graphics/getArc');
var entry = {

View File

@ -146,7 +146,7 @@
deflate: '../dep/pako_deflate.min'
}
});
define('jquery', $);
define('jquery', window.jQuery);
require(['fonteditor/main'])
</script>
<form id="font-form" style="width:0px;height:0px;overflow:hidden;"><input id="font-import" type="file" multiple="multiple"></form>