diff options
author | Marco Ziener <mziener@lavabit.com> | 2010-10-13 12:01:52 +0200 |
---|---|---|
committer | Marco Ziener <mziener@lavabit.com> | 2010-10-13 12:01:52 +0200 |
commit | c99c47da34ef134d226c074c30e87319d74e450c (patch) | |
tree | cf3c03eb68d45abf95a1c3017e5a3bf5fa31ca42 /calc | |
parent | 68f420b2468d4881c66548321c46307f7ce5c5fc (diff) | |
parent | 3b4edbdddf8af55f63c22bb3ba80fffa46156dd2 (diff) | |
download | erlang-c99c47da34ef134d226c074c30e87319d74e450c.tar.gz erlang-c99c47da34ef134d226c074c30e87319d74e450c.tar.xz erlang-c99c47da34ef134d226c074c30e87319d74e450c.zip |
Merge branch 'master' of ssh://git.animux.de/erlang
Diffstat (limited to '')
-rw-r--r-- | calc/calc.erl (renamed from calc.erl) | 0 | ||||
-rw-r--r-- | calc/remote.erl (renamed from remote.erl) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/remote.erl b/calc/remote.erl index 793c27c..793c27c 100644 --- a/remote.erl +++ b/calc/remote.erl |