3.x: merged gar1t's fork #46

Closed
wants to merge 33 commits into
from

Conversation

Projects
None yet
5 participants
@rakvat

rakvat commented Jan 20, 2013

merged gar1t's fork into 3.x and fixed tests

zguide erlang examples use erlzmq_device (e.g. in msgqueue.es) which was only available on gar1t's fork. I merged it in branch 3.x and adapted the tests. I request to pull my commits into 3.x to make life easier for erlang-zguide-readers.

gar1t and others added some commits Aug 7, 2011

switch to the more reliable git https protocol
Https seems to be more reliable on github and we dont need to push so
lets just use that.
Yurii Rashkovskii
Merge branch '3.1.0' of https://github.com/ericbmerritt/erlzmq2 into …
…ericbmerritt-3.1.0

Conflicts:
	c_src/erlzmq_nif.c
Update c_src/erlzmq_nif.c
Added `#include <sys/types.h>` for the definition of int64_t
on FreeBSD 9.1.

@rakvat rakvat closed this Jan 21, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment