Commit graph

9 commits

Author SHA1 Message Date
Christopher Franko
3ff20825fa merge cleanup 2 2016-10-08 10:46:57 -04:00
Christopher Franko
6a1f963ce2 Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.4.4 2016-06-16 20:02:11 -04:00
Christopher Franko
e959453cda Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.4.4 2016-06-14 18:14:19 -04:00
Bas van Kervel
71b577f839 [release/1.4.7] console: ignore round and curly brackets in strings when determining indentation level
(cherry picked from commit dbcdf83ed8)
2016-06-14 17:11:54 +03:00
Péter Szilágyi
688fbab5d5 [release/1.4.7] console: fix windows color transformation issue
(cherry picked from commit d251d48439)
2016-06-14 17:11:12 +03:00
Felix Lange
8b90a49f3d [release/1.4.6] console: remove unnecessary JS evaluation in Welcome
(cherry picked from commit ad0e6e971e)
2016-06-06 16:21:56 +03:00
Péter Szilágyi
5904d58a96 [release/1.4.6] cmd/geth, console: fix reviewer issues
(cherry picked from commit da729e5b38)
2016-06-06 16:21:46 +03:00
Péter Szilágyi
7c90a2e42e [release/1.4.6] console, internal/jsre: colorize JavaScript exceptions too
(cherry picked from commit 14ae5708d6)
2016-06-06 16:21:44 +03:00
Péter Szilágyi
c39de61a0a [release/1.4.6] cmd, console: split off the console into a reusable package
(cherry picked from commit ffaf58f0a9)
2016-06-06 16:21:41 +03:00