# HG changeset patch
# User Thomas Harning Jr <harningt@gmail.com>
# Date 1295140453 18000
# Node ID d94eb4cfcd7e4ae88b30f4e82d66d08490bb8069
# Parent  36ce9962277c273bce7cbde1986fa9d9dcac0d9c
base: updates changelog w/ recent changes

diff -r 36ce9962277c -r d94eb4cfcd7e CHANGELOG
--- a/CHANGELOG	Sat Jan 15 20:13:03 2011 -0500
+++ b/CHANGELOG	Sat Jan 15 20:14:13 2011 -0500
@@ -1,6 +1,8 @@
 WIP - 2011-01-15
  * Fixed libevent 2.0 compilation errors
  * Merged all of luaevent-prosody changes
+ * Removes low-level read access to watermark & timeout values that break API
+ * Switches to watermark write accessor function to avoid API break
 ======
 luaevent-prosody 0.1.0 - 2010-02-15
  * Fixed stack slot leak in event callbacks