summaryrefslogtreecommitdiff
path: root/devices
diff options
context:
space:
mode:
authormalosek <malosek@fastmq.com>2010-01-05 11:05:03 +0100
committermalosek <malosek@fastmq.com>2010-01-05 11:05:03 +0100
commit472ddf8de2c93f750831d52b5473cdbed1db51e8 (patch)
tree476650afd868502a5a023599910c5415fdc57fe6 /devices
parentd10c605fa94a8fe8265785043aeef63983e07f3f (diff)
parent4f6baf4dde627656b63cc4e2acdb78a8577ba640 (diff)
fixed failed merge with autogen.sh
Diffstat (limited to 'devices')
-rw-r--r--devices/zmq_forwarder/zmq_forwarder.cpp2
-rw-r--r--devices/zmq_queue/zmq_queue.cpp2
-rw-r--r--devices/zmq_streamer/zmq_streamer.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/devices/zmq_forwarder/zmq_forwarder.cpp b/devices/zmq_forwarder/zmq_forwarder.cpp
index 277af72..42d65b4 100644
--- a/devices/zmq_forwarder/zmq_forwarder.cpp
+++ b/devices/zmq_forwarder/zmq_forwarder.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2007-2009 FastMQ Inc.
+ Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.
diff --git a/devices/zmq_queue/zmq_queue.cpp b/devices/zmq_queue/zmq_queue.cpp
index 78ccd2d..a90aac7 100644
--- a/devices/zmq_queue/zmq_queue.cpp
+++ b/devices/zmq_queue/zmq_queue.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2007-2009 FastMQ Inc.
+ Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.
diff --git a/devices/zmq_streamer/zmq_streamer.cpp b/devices/zmq_streamer/zmq_streamer.cpp
index c1b88ec..a2906d9 100644
--- a/devices/zmq_streamer/zmq_streamer.cpp
+++ b/devices/zmq_streamer/zmq_streamer.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2007-2009 FastMQ Inc.
+ Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.