diff options
| author | malosek <malosek@fastmq.com> | 2010-01-05 11:05:03 +0100 |
|---|---|---|
| committer | malosek <malosek@fastmq.com> | 2010-01-05 11:05:03 +0100 |
| commit | 472ddf8de2c93f750831d52b5473cdbed1db51e8 (patch) | |
| tree | 476650afd868502a5a023599910c5415fdc57fe6 /src | |
| parent | d10c605fa94a8fe8265785043aeef63983e07f3f (diff) | |
| parent | 4f6baf4dde627656b63cc4e2acdb78a8577ba640 (diff) | |
fixed failed merge with autogen.sh
Diffstat (limited to 'src')
114 files changed, 132 insertions, 119 deletions
diff --git a/src/app_thread.cpp b/src/app_thread.cpp index 69e0942..c55eb75 100644 --- a/src/app_thread.cpp +++ b/src/app_thread.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/src/app_thread.hpp b/src/app_thread.hpp index 14cb8c5..0e2c3e1 100644 --- a/src/app_thread.hpp +++ b/src/app_thread.hpp @@ -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/src/atomic_bitmap.hpp b/src/atomic_bitmap.hpp index 6b7218e..6620f06 100644 --- a/src/atomic_bitmap.hpp +++ b/src/atomic_bitmap.hpp @@ -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/src/atomic_counter.hpp b/src/atomic_counter.hpp index 2cd225a..649fdbf 100644 --- a/src/atomic_counter.hpp +++ b/src/atomic_counter.hpp @@ -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/src/atomic_ptr.hpp b/src/atomic_ptr.hpp index f96782f..3735e99 100644 --- a/src/atomic_ptr.hpp +++ b/src/atomic_ptr.hpp @@ -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/src/command.hpp b/src/command.hpp index 8aa7c56..469d6ec 100644 --- a/src/command.hpp +++ b/src/command.hpp @@ -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/src/config.hpp b/src/config.hpp index 43a4513..9724733 100644 --- a/src/config.hpp +++ b/src/config.hpp @@ -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/src/decoder.hpp b/src/decoder.hpp index 5098dd5..1662bda 100644 --- a/src/decoder.hpp +++ b/src/decoder.hpp @@ -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/src/devpoll.cpp b/src/devpoll.cpp index 0ee772b..003f465 100644 --- a/src/devpoll.cpp +++ b/src/devpoll.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/src/devpoll.hpp b/src/devpoll.hpp index b796ba5..019d268 100644 --- a/src/devpoll.hpp +++ b/src/devpoll.hpp @@ -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/src/dispatcher.cpp b/src/dispatcher.cpp index 7115bca..9e713c2 100644 --- a/src/dispatcher.cpp +++ b/src/dispatcher.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/src/dispatcher.hpp b/src/dispatcher.hpp index 8364d4d..799e65b 100644 --- a/src/dispatcher.hpp +++ b/src/dispatcher.hpp @@ -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/src/downstream.cpp b/src/downstream.cpp index be1c4cc..2da08e3 100644 --- a/src/downstream.cpp +++ b/src/downstream.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/src/downstream.hpp b/src/downstream.hpp index bf8cabb..35dec95 100644 --- a/src/downstream.hpp +++ b/src/downstream.hpp @@ -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/src/encoder.hpp b/src/encoder.hpp index cb43f9f..bd62298 100644 --- a/src/encoder.hpp +++ b/src/encoder.hpp @@ -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/src/epoll.cpp b/src/epoll.cpp index b25883f..e22eb8c 100644 --- a/src/epoll.cpp +++ b/src/epoll.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/src/epoll.hpp b/src/epoll.hpp index 90824bd..38175cb 100644 --- a/src/epoll.hpp +++ b/src/epoll.hpp @@ -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/src/err.cpp b/src/err.cpp index 36cb2fc..0ff6335 100644 --- a/src/err.cpp +++ b/src/err.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/src/err.hpp b/src/err.hpp index 88097b5..6c13b02 100644 --- a/src/err.hpp +++ b/src/err.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -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/src/fd_signaler.cpp b/src/fd_signaler.cpp index 5a8dcc1..a3a73c1 100644 --- a/src/fd_signaler.cpp +++ b/src/fd_signaler.cpp @@ -1,5 +1,5 @@ /* |