Skip to content
Browse files

Merge branch 'master' into multi_socket

Conflicts:
	src/gen_nb_server.erl
  • Loading branch information...
2 parents 8939e2b + c6cec27 commit 7b5f58e9640c42c3630b5f0853285f6a043343e2 @bigkevmcd bigkevmcd committed Jan 9, 2011
Showing with 5 additions and 7 deletions.
  1. +0 −7 ebin/gen_nb_server.app
  2. BIN rebar
  3. 0 src/gen_nb_server.app
  4. +5 −0 src/gen_nb_server.app.src
View
7 ebin/gen_nb_server.app
@@ -1,7 +0,0 @@
-% -*- mode: erlang -*-
-{application, gen_nb_server,
- [{description, "Non-blocking TCP socket listener library"},
- {vsn, "0.2"},
- {modules, [gen_nb_server]},
- {registered, []},
- {applications, [kernel, stdlib, sasl]}]}.
View
BIN rebar
Binary file not shown.
View
0 src/gen_nb_server.app
No changes.
View
5 src/gen_nb_server.app.src
@@ -0,0 +1,5 @@
+{application, gen_nb_server,
+ [{description, "Simple behavior for writing non-blocking servers"},
+ {vsn, "1.0"},
+ {modules, []},
+ {applications, [kernel, stdlib]}]}.

0 comments on commit 7b5f58e

Please sign in to comment.
Something went wrong with that request. Please try again.