Merge branch 'ts2dart' of github.com:alexeagle/angular into ts2dart

Conflicts:
	gulpfile.js
This commit is contained in:
Alex Eagle 2015-03-23 13:36:39 -07:00
commit 35a376acdb

View File

@ -357,10 +357,7 @@ gulp.task('build/format.dart.ts2dart', rundartpackage(gulp, gulpPlugins, {
args: ['dart_style:format', '-w', 'dist/dart.ts2dart'] args: ['dart_style:format', '-w', 'dist/dart.ts2dart']
})); }));
gulp.task('ts2dart', function(done) { gulp.task('ts2dart', function(done) {
runSequence( runSequence('build/transpile.dart.ts2dart', 'build/format.dart.ts2dart', done);
'build/transpile.dart.ts2dart', 'build/format.dart.ts2dart',
done
);
}); });
// ------------ // ------------