diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-09-04 16:20:25 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-09-04 16:20:25 +0200 |
| commit | f4ccefe6a41897e9aa5fab72d86d9b481785baec (patch) | |
| tree | 22f9f9144842107a264b0d0bb33f3d74d8530c85 /.gitignore | |
| parent | 502b9f0551d1216db72f91031aab1113e5a39f4a (diff) | |
| parent | d46519da657ada39d9928308709cdb80ddcd53ce (diff) | |
| download | scala-f4ccefe6a41897e9aa5fab72d86d9b481785baec.tar.gz scala-f4ccefe6a41897e9aa5fab72d86d9b481785baec.tar.bz2 scala-f4ccefe6a41897e9aa5fab72d86d9b481785baec.zip | |
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.10.3
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..f90835d970 --- /dev/null +++ b/.gitignore @@ -0,0 +1,48 @@ +# +# Are you tempted to edit this file? +# +# First consider if the changes make sense for all, +# or if they are specific to your workflow/system. +# If it is the latter, you can augment this list with +# entries in .git/info/excludes +# +# see also test/files/.gitignore +# + +# +# JARs aren't checked in, they are fetched by Ant / pull_binary_libs.sh +# +# We could be more concise with /lib/**/*.jar but that assumes +# a late-model git. +# +/lib/ant/*.jar +/lib/*.jar +/test/files/codelib/*.jar +/test/files/lib/*.jar +/test/files/speclib/instrumented.jar +/tools/*.jar + +# Developer specific Ant properties +/build.properties + +# target directories for ant build +/build/ +/dists/ + +# other +/out/ +/bin/ +/sandbox/ + +# eclipse, intellij +/.classpath +/.project +/src/intellij/*.iml +/src/intellij/*.ipr +/src/intellij/*.iws +/.cache +/.idea +/.settings + +# Standard symbolic link to build/quick/bin +/qbin |