Changeset [e33bd4446576e7125cdcbd36f0b731aa5e438ed8] by Jesse Gumm
Revision e33bd4446576e7125cdcbd36f0b731aa5e438ed8,
committed by Jesse Gumm
· February 16th, 2012 @ 12:24 AM
Merge branch 'master' of github.com:choptastic/nitrogen into windows
Conflicts:
rebar
rel/overlay/common/rebar
rel/rebar
rel/reltool_inets.config
https://github.com/nitrogen/nitrogen/commit/e33bd4446576e7125cdcbd3...
14 changed files
-
A
rel/copy_erl_interface.escript -
R
rel/overlay/common/rebar -
R
rel/rebar -
M
.gitignore -
M
Makefile -
M
rebar -
M
rebar.config -
M
rel/overlay/mochiweb/rebar.config -
M
rel/overlay/webmachine/rebar.config -
M
rel/overlay/yaws/rebar.config -
M
rel/reltool_inets.config -
M
rel/reltool_mochiweb.config -
M
rel/reltool_webmachine.config -
M
rel/reltool_yaws.config