summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2012-03-13 11:28:22 +0100
committerMartin Sustrik <sustrik@250bpm.com>2012-03-13 11:28:22 +0100
commit4ae2af8c9a3f9f928b411eb31b4007a4ce8f26ba (patch)
tree328326b76b2793875b195c3e9dea3c493b28b34a /include
parent921da22147e201455837bcd38df1af33aceff26f (diff)
parent46f8864e4879b257e20c7686f6e8e008cd749939 (diff)
Merge branch 'for-sustrik' of git.lucina.net:libxs
Diffstat (limited to 'include')
-rw-r--r--include/zmq.h (renamed from include/xszmq.h)0
-rw-r--r--include/zmq_utils.h (renamed from include/xszmq_utils.h)0
2 files changed, 0 insertions, 0 deletions
diff --git a/include/xszmq.h b/include/zmq.h
index 4463d9d..4463d9d 100644
--- a/include/xszmq.h
+++ b/include/zmq.h
diff --git a/include/xszmq_utils.h b/include/zmq_utils.h
index b25bf91..b25bf91 100644
--- a/include/xszmq_utils.h
+++ b/include/zmq_utils.h