浏览代码

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

Upstream merges
Kristofer Rye 11 年之前
父节点
当前提交
38488f2440
共有 3 个文件被更改,包括 5 次插入6 次删除
  1. 1 6
      Dart.gitignore
  2. 2 0
      Global/DartEditor.gitignore
  3. 2 0
      Gradle.gitignore

+ 1 - 6
Dart.gitignore

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

+ 2 - 0
Global/DartEditor.gitignore

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

+ 2 - 0
Gradle.gitignore

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