Merge branch 'master' of github.com:sustrik/zeromq2

96b26907 · Martin Lucina · 60ce5cc8 · a2f9899f · 96b26907 · 96b26907
Commit 96b26907 authored Feb 16, 2010 by Martin Lucina
Expand all Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.gitignore .gitignore +0 -1

COPYING COPYING +0 -0

zmq_poll.txt doc/zmq_poll.txt +2 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
-COPYING
 INSTALL
 Makefile
 Makefile.in

--- a/COPYING
+++ b/COPYING
--- a/doc/zmq_poll.txt
+++ b/doc/zmq_poll.txt
@@ -49,7 +49,8 @@ infinite timeout.
 RETURN VALUE
 ------------
-Function returns number of items signaled or -1 in the case of error.
+Function returns number of items signaled, 0 in the case of timeout or -1
+in the case of error.
 ERRORS