Merge master to fortuna #530

Merged
zxq9 merged 52 commits from merge_master_to_fortuna into fortuna 2019-03-05 22:51:14 +09:00
2 changed files with 11 additions and 1 deletions
Showing only changes of commit 1cfd4c6f24 - Show all commits

View File

@ -29,3 +29,13 @@
{plt_apps, all_deps}, {plt_apps, all_deps},
{base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]} {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]}
]}. ]}.
{relx, [{release, {aesophia, "2.0.0"},
[aesophia, aebytecode, getopt]},
{dev_mode, true},
{include_erts, false},
{extended_start_script, true}]}.

View File

@ -1,7 +1,7 @@
{"1.1.0", {"1.1.0",
[{<<"aebytecode">>, [{<<"aebytecode">>,
{git,"https://github.com/aeternity/aebytecode.git", {git,"https://github.com/aeternity/aebytecode.git",
{ref,"c5a9878bd9c56f623fe2caad30a1ead3dac1f391"}}, {ref,"3c056db0b54872a74f325fe1446cab2b53f478f4"}},
0}, 0},
{<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0}, {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0},
{<<"jsx">>, {<<"jsx">>,