Merge branch 'maint'

Browse Source

* maint:
  Version number increased.

Conflicts:
	include/zmq.h

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

...

This commit is contained in:

Martin Sustrik

2010-10-16 00:49:01 +02:00

parent 18d46c8104 710615cdab

commit ae5a3c8a99

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available