diff options
| author | Magnus Feuer <mfeuer@jaguarlandrover.com> | 2015-06-05 11:45:06 -0700 |
|---|---|---|
| committer | Magnus Feuer <mfeuer@jaguarlandrover.com> | 2015-06-09 13:53:13 -0700 |
| commit | 86ad628e16f4ca5e75d1980b84cc7f740a6604c6 (patch) | |
| tree | 03adf950085f3fef1f87c805459e273a3de78dbb /.gitignore | |
| parent | 615d7cda45973982331905fce85ef63119ebf907 (diff) | |
| download | rvi_core-86ad628e16f4ca5e75d1980b84cc7f740a6604c6.tar.gz | |
Converted dlink_tcp to JSON. Updated mod in prep for test1 deployment. Modified JSON processing. Updated config to only load BT and bert modules.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,10 +1,11 @@ -<<<<<<< HEAD ebin deps .eunit *.o *.beam *.plt +*.pyc +*~ erl_crash.dump rel/example_project .concrete/DEV_MODE |