From 283db7539edd15ef9b79221e33d105ac0903d90c Mon Sep 17 00:00:00 2001 From: Thomas Harning Jr Date: Sat, 15 Jan 2011 19:57:56 -0500 Subject: [PATCH] docs: adjusted to note that luaevent-prosody was merged into this WIP --- CHANGELOG | 4 ++++ README | 21 +++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2079f48..469580d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +WIP - 2011-01-15 + * Fixed libevent 2.0 compilation errors + * Merged all of luaevent-prosody changes +====== luaevent-prosody 0.1.0 - 2010-02-15 * Fixed stack slot leak in event callbacks * Fixed stack slot leak when error occurs in callback diff --git a/README b/README index 087fbe0..5a48380 100644 --- a/README +++ b/README @@ -1,28 +1,18 @@ -luaevent-prosody is a (hopefully temporary) fork of the luaevent library. This fork is -maintained by Matthew Wild . - -Source repository: http://code.matthewwild.co.uk/luaevent-prosody - -This luaevent-prosody 0.1.0 release is based on luaevent 0.2.0. See CHANGELOG for more -information about the changes. - -=== Original README from luaevent 0.2.0 === - Description: This is a binding of libevent to Lua. It will serve as a drop-in replacement for copas, and eventually support more features (async DNS, HTTP, RPC...). Contact information: Lead: Thomas Harning +Major contributions from prosody project: + Matthew Wild: mwild1@gmail.com + + Project page: http://luaforge.net/projects/luaevent/ GIT Repositories: - git://repo.or.cz/luaevent.git - http://repo.or.cz/r/luaevent.git -Try checking it out and working on it, the 'mob' feature is enabled so you can commit w/: -git push git+ssh://mob@repo.or.cz/srv/git/luaevent.git master:mob + See: https://github.com/harningt/luaevent Build Requirements: - premake (>= 3.3 < 4) libevent (recommend >= 1.3b) Usage Requirements: libevent (recommend >= 1.3b) @@ -32,6 +22,5 @@ See test/ directory for examples of usage. Dependencies: - premake - http://premake.sourceforge.net/download libevent - http://monkey.org/~provos/libevent/ LuaSocket - http://www.cs.princeton.edu/~diego/professional/luasocket/ -- 2.11.4.GIT