Merge branch 'master' into add-common-linux-compile-file-extensions

Upstream merges
This commit is contained in:
Kristofer Rye 2013-11-26 22:42:07 -05:00
commit 38488f2440
3 changed files with 5 additions and 6 deletions

View File

@ -1,7 +1,5 @@
// Dont commit the following files and directories created by pub, Dart Editor, and dart2js // Dont commit the following files and directories created by pub and dart2js
packages/ packages/
.project
.buildlog
*.js_ *.js_
*.js.deps *.js.deps
*.js.map *.js.map
@ -11,6 +9,3 @@ pubspec.lock
// Avoid committing generated JavaScript files // Avoid committing generated JavaScript files
*.dart.js *.dart.js
// Check for any other incovenient files generated by OS
// and other tools such as Eclipse, IntelliJ, etc.

View File

@ -0,0 +1,2 @@
.project
.buildlog

2
Gradle.gitignore Normal file
View File

@ -0,0 +1,2 @@
.gradle
build/