Merge branch 'master' of https://github.com/jiahao/Showoff.jl into ji…

…ahao-master
dcjones · Apr 11, 2015 · 39b9288 · 39b9288
2 parents 81d780d + 4f1561c
commit 39b9288
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The Showoff.jl package is licensed under the MIT "Expat" License:
 
-> Copyright (c) 2014: Daniel C. Jones.
+> Copyright (c) 2014--2015: Daniel C. Jones and [other contributors](https://github.com/dcjones/Showoff.jl/graphs/contributors).
 >
 > Permission is hereby granted, free of charge, to any person obtaining
 > a copy of this software and associated documentation files (the

diff --git a/src/Showoff.jl b/src/Showoff.jl
@@ -218,7 +218,7 @@ function format_fixed_scientific(x::FloatingPoint, precision::Integer,
 
     mag = floor(Int, log10(abs(x)))
     if mag < 0
-        grisu_precision = precision + abs(@compat round(Int, mag))
+        grisu_precision = precision + abs(round(Int, mag))
     else
         grisu_precision = precision
     end