aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-09-28 13:57:19 +0300
committerLoïc Hoguin <[email protected]>2014-09-28 13:57:19 +0300
commite0a7d8e9495ef81bc8cc3d40841a9f6f1917ce00 (patch)
treeb96c119652657b86eae27cd6a8200dc9dc57b42f
parent8d28f5ddf9356e1b09a28a88a85e5484ea293556 (diff)
parent5b23708059a970bc464fc0e4ffd53632b3c5b1f0 (diff)
downloaderlang.mk-e0a7d8e9495ef81bc8cc3d40841a9f6f1917ce00.tar.gz
erlang.mk-e0a7d8e9495ef81bc8cc3d40841a9f6f1917ce00.tar.bz2
erlang.mk-e0a7d8e9495ef81bc8cc3d40841a9f6f1917ce00.zip
Merge branch 'master' of git://github.com/crownedgrouse/erlang.mk
Conflicts: packages.v1.tsv packages.v1.txt packages.v2.tsv
-rw-r--r--packages.v1.tsv2
-rw-r--r--packages.v1.txt2
-rw-r--r--packages.v2.tsv2
3 files changed, 6 insertions, 0 deletions
diff --git a/packages.v1.tsv b/packages.v1.tsv
index de1d9ec..9804a70 100644
--- a/packages.v1.tsv
+++ b/packages.v1.tsv
@@ -5,8 +5,10 @@ classifier https://github.com/inaka/classifier.git https://github.com/inaka/clas
cowboy https://github.com/ninenines/cowboy http://ninenines.eu Small, fast and modular HTTP server.
cowlib https://github.com/ninenines/cowlib http://ninenines.eu Support library for manipulating Web protocols.
czmq https://github.com/gar1t/erlang-czmq.git https://github.com/gar1t/erlang-czmq External port bindings for CZMQ.
+debbie https://github.com/crownedgrouse/debbie.git https://github.com/crownedgrouse/debbie .DEB Built In Erlang
e2 https://github.com/gar1t/e2.git http://e2project.org Library to simply writing correct OTP applications.
ebitly https://github.com/inaka/ebitly.git http://inaka.github.com/ebitly Bit.ly API wrapper for Erlang
+edgar https://github.com/crownedgrouse/edgar.git https://github.com/crownedgrouse/edgar Erlang Does GNU AR
edis https://github.com/inaka/edis.git http://inaka.github.com/edis/ An Erlang implementation of Redis KV Store
eganglia https://github.com/inaka/eganglia.git https://github.com/inaka/eganglia.git Erlang library to interact with Ganglia
ehsa https://bitbucket.org/a12n/ehsa https://bitbucket.org/a12n/ehsa Erlang HTTP server basic and digest authentication modules
diff --git a/packages.v1.txt b/packages.v1.txt
index de1d9ec..9804a70 100644
--- a/packages.v1.txt
+++ b/packages.v1.txt
@@ -5,8 +5,10 @@ classifier https://github.com/inaka/classifier.git https://github.com/inaka/clas
cowboy https://github.com/ninenines/cowboy http://ninenines.eu Small, fast and modular HTTP server.
cowlib https://github.com/ninenines/cowlib http://ninenines.eu Support library for manipulating Web protocols.
czmq https://github.com/gar1t/erlang-czmq.git https://github.com/gar1t/erlang-czmq External port bindings for CZMQ.
+debbie https://github.com/crownedgrouse/debbie.git https://github.com/crownedgrouse/debbie .DEB Built In Erlang
e2 https://github.com/gar1t/e2.git http://e2project.org Library to simply writing correct OTP applications.
ebitly https://github.com/inaka/ebitly.git http://inaka.github.com/ebitly Bit.ly API wrapper for Erlang
+edgar https://github.com/crownedgrouse/edgar.git https://github.com/crownedgrouse/edgar Erlang Does GNU AR
edis https://github.com/inaka/edis.git http://inaka.github.com/edis/ An Erlang implementation of Redis KV Store
eganglia https://github.com/inaka/eganglia.git https://github.com/inaka/eganglia.git Erlang library to interact with Ganglia
ehsa https://bitbucket.org/a12n/ehsa https://bitbucket.org/a12n/ehsa Erlang HTTP server basic and digest authentication modules
diff --git a/packages.v2.tsv b/packages.v2.tsv
index d90afea..fbe7910 100644
--- a/packages.v2.tsv
+++ b/packages.v2.tsv
@@ -5,8 +5,10 @@ classifier git https://github.com/inaka/classifier.git 1 https://github.com/inak
cowboy git https://github.com/ninenines/cowboy 1.0.0 http://ninenines.eu Small, fast and modular HTTP server.
cowlib git https://github.com/ninenines/cowlib 1.0.0 http://ninenines.eu Support library for manipulating Web protocols.
czmq git https://github.com/gar1t/erlang-czmq.git master https://github.com/gar1t/erlang-czmq External port bindings for CZMQ.
+debbie git https://github.com/crownedgrouse/debbie.git master https://github.com/crownedgrouse/debbie .DEB Built In Erlang
e2 git https://github.com/gar1t/e2.git master http://e2project.org Library to simply writing correct OTP applications.
ebitly git https://github.com/inaka/ebitly.git 0.0.1 http://inaka.github.com/ebitly Bit.ly API wrapper for Erlang
+edgar git https://github.com/crownedgrouse/edgar.git master https://github.com/crownedgrouse/edgar Erlang Does GNU AR
edis git https://github.com/inaka/edis.git 0.2.0 http://inaka.github.com/edis/ An Erlang implementation of Redis KV Store
eganglia git https://github.com/inaka/eganglia.git 0.9.1 https://github.com/inaka/eganglia.git Erlang library to interact with Ganglia
ehsa hg https://bitbucket.org/a12n/ehsa 2.0.4 https://bitbucket.org/a12n/ehsa Erlang HTTP server basic and digest authentication modules