Просмотр исходного кода

Merge branch 'master' of git://github.com/crownedgrouse/erlang.mk

Conflicts:
	packages.v1.tsv
	packages.v1.txt
	packages.v2.tsv
Loïc Hoguin 10 лет назад
Родитель
Сommit
e0a7d8e949
3 измененных файлов с 6 добавлено и 0 удалено
  1. 2 0
      packages.v1.tsv
  2. 2 0
      packages.v1.txt
  3. 2 0
      packages.v2.tsv

+ 2 - 0
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

+ 2 - 0
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

+ 2 - 0
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