Merge branch 'master' of git://github.com/JuliaLang/julia

.gitignore

@@ -7,12 +7,15 @@
 /dist
 
 /julia
+/julia-*
 /h2j
 
 *.exe
 *.dll
 *.do
 *.o
+*.dylib
+*.dSYM
 
 *.out
 
@@ -22,5 +25,7 @@
 *.creator
 *.user
 *.orig
+*.swp
+*.kate-swp
 
 /usr

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "deps/openlibm"]
 	path = deps/openlibm
 	url = git://github.com/JuliaLang/openlibm.git
+[submodule "deps/Rmath"]
+	path = deps/Rmath
+	url = git://github.com/JuliaLang/Rmath.git

.mailmap

@@ -59,6 +59,7 @@ Ivan Mantova <horphus@gmail.com> <horphus@gmail.com>
 Keno Fischer <kfischer@college.harvard.edu> <kfischer@college.harvard.edu>
 Keno Fischer <kfischer@college.harvard.edu> <kfischer+github@college.harvard.edu>
 Keno Fischer <kfischer@college.harvard.edu> <kenof@stanford.edu>
+Keno Fischer <kfischer@college.harvard.edu> <keno@30-9-48.wireless.csail.mit.edu>
 
 Harlan Harris <harlan@harris.name> <harlan@harris.name>
 Harlan Harris <harlan@harris.name> <harlan.harris@kaplan.com>
@@ -86,3 +87,16 @@ Adam Savitzky <adam.savitzky@gmail.com> <asavitzky@forio.com>
 David Slate <dslate@speakeasy.net> <dslate@speakeasy.net>
 
 Francois Pepin <fpepin@gmail.com> <fpepin@gmail.com>
+
+Waldir Pimenta <waldir@email.com> <waldir@email.com>
+
+Steven G. Johnson <stevenj@alum.mit.edu> <stevenj@mit.edu>
+
+Isaiah Norton <isaiah.norton@gmail.com> <isaiah.norton@gmail.com>
+Isaiah Norton <isaiah.norton@gmail.com> <inorton@bwh.harvard.edu> 
+
+Blake Johnson <blakejohnson04@gmail.com> <blakejohnson04@gmail.com>
+Blake Johnson <blakejohnson04@gmail.com> <bjohnson@bbn.com>
+
+Marcus Silva <marcus.ps+github@gmail.com> <marcus.ps+github@gmail.com> 
+Marcus Silva <marcus.ps+github@gmail.com> <msilva@bbn.com>

.travis.yml

@@ -5,14 +5,14 @@ compiler:
 notifications:
     email: false
 before_install:
-    - BUILDOPTS="LLVM_CONFIG=llvm-config-3.1 USE_QUIET=0"; for lib in LLVM ZLIB SUITESPARSE ARPACK BLAS FFTW LAPACK LIGHTTPD GMP PCRE LIBUNWIND READLINE GLPK; do export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; done
+    - BUILDOPTS="LLVM_CONFIG=llvm-config-3.2 USE_QUIET=0 USE_LIB64=0"; for lib in LLVM ZLIB SUITESPARSE ARPACK BLAS FFTW LAPACK GMP PCRE LIBUNWIND READLINE GRISU OPENLIBM RMATH; do export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; done
     - sudo apt-get update -qq -y
     - sudo apt-get install zlib1g-dev
     - sudo add-apt-repository ppa:staticfloat/julia-deps -y
     - sudo apt-get update -qq -y
-    - sudo apt-get install gfortran llvm-3.1-dev libsuitesparse-dev libncurses5-dev libopenblas-dev libarpack2-dev libfftw3-dev libpcre3-dev libglpk-dev lighttpd libgmp-dev libunwind7-dev libreadline-dev -y
-script: make $BUILDOPTS PREFIX=/tmp/julia install
-after_script:
+    - sudo apt-get install patchelf gfortran llvm-3.2-dev libsuitesparse-dev libncurses5-dev libopenblas-dev liblapack-dev libarpack2-dev libfftw3-dev libgmp-dev libpcre3-dev libunwind7-dev libreadline-dev libdouble-conversion-dev libopenlibm-dev librmath-dev -y
+script:
+    - make $BUILDOPTS PREFIX=/tmp/julia install
     - cd .. && mv julia julia2
     - cd /tmp/julia/share/julia/test && /tmp/julia/bin/julia runtests.jl all
     - cd - && mv julia2 julia

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-Hi! Thanks for checking out Julia. If you have questions or problems, the [Julia dev list](https://groups.google.com/forum/?fromgroups#!forum/julia-dev) is a good place to post them, but you should check out the [online Julia docs](http://docs.julialang.org/en/latest/) first. If you have changes you'd like to contribute, you'll need a [free GitHub account](https://github.com/signup/free). (If you're reading this on GitHub, you probably already have one.) You'll also want a working copy of Julia, built from source (you can still contribute with a binary install, but it's harder and not really recommended). In list form, here's what to do to become a contributor:
+Hi! Thanks for checking out Julia. If you have questions or problems, the [Julia dev list](https://groups.google.com/forum/?fromgroups#!forum/julia-dev) is a good place to post them, but you should check out the [online Julia docs](http://docs.Julialang.org/en/latest/) first. If you have changes you'd like to contribute, you'll need a [free GitHub account](https://github.com/signup/free). (If you're reading this on GitHub, you probably already have one.) You'll also want a working copy of Julia, built from source (you can still contribute with a binary install, but it's harder and not really recommended). In list form, here's what to do to become a contributor:
 
 * Join the [dev list](https://groups.google.com/forum/?fromgroups#!forum/julia-dev).
 
@@ -14,36 +14,41 @@ Hi! Thanks for checking out Julia. If you have questions or problems, the [Julia
 
 ## Submitting your contributions
 
-Julia now has a [package manager](https://github.com/JuliaLang/METADATA.jl). Most developers writing julia libraries are encouraged to provide them as a julia package. In case you are contributing to the core functionality or the base libraries, the process is as follows.
+### Contributing to core functionality or base libraries
 
 The Julia team uses [GitHub issues](https://github.com/JuliaLang/julia/issues) to track and discuss problems, feature requests, and pull requests.
 
-You can make pull requests for incomplete features to get code review. The convention is to prefix the pull request title with "WIP:" or "RFC:" as appropriate to indicate that the work is incomplete, so that it is not accidentally merged.
+You can make pull requests for incomplete features to get code review. The convention is to prefix the pull request title with "WIP:" for Work In Progress, or "RFC:" for Request for Comments when work is completed and ready for merging. This will prevent accidental merging of work that is in progress.
 
 Before submitting, make sure that all tests pass by running `make testall`. Add your own tests for the new functionality in `test/`. If your contribution includes changes to Makefiles or external dependencies, make sure you can build Julia from a clean tree using `git clean -fdx` or equivalent (be careful – this command will delete any files lying around that aren't checked into git). Make sure that [Travis](http://www.travis-ci.org) greenlights the pull request with a `Good to merge` message.
 
 *By contributing code to Julia, you are agreeing to release it under the [MIT License](https://github.com/JuliaLang/julia/tree/master/LICENSE.md).*
 
+### Contributing a Julia package
+
+Julia has a built-in [package manager](https://github.com/JuliaLang/METADATA.jl) based on git. A number of [packages](http://docs.julialang.org/en/latest/packages/packagelist/) across many domains are already available for julia. Developers are encouraged to provide their libraries as a Julia package. The Julia manual provides instructions on [creating julia packages](http://docs.julialang.org/en/latest/manual/packages/). 
+
+For developers who need to wrap C libraries so that they can be called from Julia, the [Clang.jl](https://github.com/ihnorton/Clang.jl) package can help generate the wrappers automatically from the C header files.
+
 ## Getting help
 
-While getting familiar with Julia, remember to check out [the docs](http://docs.julialang.org/en/latest/), keeping in mind that they are [searchable](http://docs.julialang.org/en/latest/search/). (If you use a script blocker then you'll have to unblock that page.) The [source code](https://github.com/JuliaLang/julia) is an excellent source of examples (and it's mostly pretty approachable). If you're still stumped, post something on [the dev list](https://groups.google.com/forum/?fromgroups#!forum/julia-dev), but you may want to search the archives first to see if there's already been a discussion about what you're stuck on.
+While getting familiar with Julia, remember to check out [the docs](http://docs.Julialang.org/en/latest/), keeping in mind that they are [searchable](http://docs.Julialang.org/en/latest/search/). (If you use a script blocker then you'll have to unblock that page.) The [source code](https://github.com/JuliaLang/julia) is an excellent source of examples (and it's mostly pretty approachable). If you're still stumped, post something on [the dev list](https://groups.google.com/forum/?fromgroups#!forum/julia-dev), but you may want to search the archives first to see if there's already been a discussion about what you're stuck on.
 
 ## Resources
 
 * Julia
   - **Homepage:** <http://julialang.org>
   - **Mailing lists:** <http://julialang.org/mailing_lists>
-  - **IRC:** <http://webchat.freenode.net/?channels=julia>
+  - **IRC:** <http://webchat.freenode.net/?channels=Julia>
   - **Source code:** <https://github.com/JuliaLang/julia>
   - **Git clone URL:** <git://github.com/JuliaLang/julia.git>
   - **Documentation:** <http://julialang.org/manual/>
+
 * Design of Julia
   - [Julia: A Fast Dynamic Language for Technical Computing](http://julialang.org/images/julia-dynamic-2012-tr.pdf)
-* Working with Types
-  - [Some Type Patterns](https://github.com/JuliaLang/julia/wiki/Code-Patterns)
-  - [The Type Hierarchy](https://github.com/JuliaLang/julia/wiki/Types-Hierarchy)
+
 * Using GitHub
   - [Using Julia with GitHub (video)](http://www.youtube.com/watch?v=wnFYV3ZKtOg&feature=youtu.be)
-  - [Using Julia on GitHub (notes for video)](https://gist.github.com/2712118#file_julia_git_pull_request.md)
+  - [Using Julia on GitHub (notes for video)](https://gist.github.com/2712118#file_Julia_git_pull_request.md)
   - [General GitHub documentation](http://help.github.com/)
   - [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

LICENSE.md

@@ -51,9 +51,9 @@ External libraries, if used, include their own licenses:
 - [DOUBLE-CONVERSION](https://code.google.com/p/double-conversion/)
 - [DSFMT](http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/LICENSE.txt)
 - [OPENLIBM](https://github.com/JuliaLang/openlibm/blob/master/LICENSE.md)
+- [FADDEEVA](http://ab-initio.mit.edu/Faddeeva)
 - [FEMTOLISP](https://github.com/JeffBezanson/femtolisp)
 - [FFTW](http://fftw.org/doc/License-and-Copyright.html)
-- [GLPK](http://www.gnu.org/software/glpk)
 - [GMP](http://gmplib.org/manual/Copying.html#Copying)
 - [LAPACK](http://netlib.org/lapack/LICENSE.txt)
 - [LIBUNWIND](http://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=blob_plain;f=LICENSE;hb=master)