Skip to content

Commit

Permalink
Merge branch 'master' of github.com:JuliaLang/julia
Browse files Browse the repository at this point in the history
  • Loading branch information
ViralBShah committed Dec 25, 2013
2 parents 4cc21ca + 38380bd commit ef3bece
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Library improvements
* Overflow detection in `parseint` ([#4874]).

* New Pkg.submit(pkg[,commit]) function to automatically submit
a Github pull request to the package author.
a GitHub pull request to the package author.

* Triple-quoted regex strings, `r"""..."""` ([#4934]).

Expand All @@ -56,6 +56,8 @@ Library improvements
``writedlm`` delimiter can be any printable object (e.g. a
``String``) instead of just a ``Char``.

* `.juliarc.jl` is now loaded for both script and REPL execution ([#5076]).

Deprecated or removed
---------------------

Expand All @@ -75,6 +77,7 @@ Deprecated or removed
[#4819]: https://github.com/JuliaLang/julia/issues/4819
[#4670]: https://github.com/JuliaLang/julia/issues/4670
[#5007]: https://github.com/JuliaLang/julia/issues/5007
[#5076]: https://github.com/JuliaLang/julia/issues/5076


Julia v0.2.0 Release Notes
Expand Down
4 changes: 2 additions & 2 deletions base/client.jl
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ function init_head_sched()
end

function init_profiler()
# Use a max size of 1M profile samples, and fire timer evey 1ms
# Use a max size of 1M profile samples, and fire timer every 1ms
Profile.init(1_000_000, 0.001)
end

Expand Down Expand Up @@ -375,7 +375,7 @@ function _start()
init_load_path()
(quiet,repl,startup,color_set,history) = process_options(ARGS)
global _use_history = history
repl && startup && load_juliarc()
startup && load_juliarc()

if repl
if !isa(STDIN,TTY)
Expand Down

0 comments on commit ef3bece

Please sign in to comment.