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 /perf/cpp | |
| parent | d10c605fa94a8fe8265785043aeef63983e07f3f (diff) | |
| parent | 4f6baf4dde627656b63cc4e2acdb78a8577ba640 (diff) | |
fixed failed merge with autogen.sh
Diffstat (limited to 'perf/cpp')
| -rw-r--r-- | perf/cpp/local_lat.cpp | 2 | ||||
| -rw-r--r-- | perf/cpp/local_thr.cpp | 2 | ||||
| -rw-r--r-- | perf/cpp/remote_lat.cpp | 2 | ||||
| -rw-r--r-- | perf/cpp/remote_thr.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/perf/cpp/local_lat.cpp b/perf/cpp/local_lat.cpp index d8fee2e..6b7cb1a 100644 --- a/perf/cpp/local_lat.cpp +++ b/perf/cpp/local_lat.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/perf/cpp/local_thr.cpp b/perf/cpp/local_thr.cpp index cbcc106..b5839be 100644 --- a/perf/cpp/local_thr.cpp +++ b/perf/cpp/local_thr.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/perf/cpp/remote_lat.cpp b/perf/cpp/remote_lat.cpp index f6ccbb4..0d75c82 100644 --- a/perf/cpp/remote_lat.cpp +++ b/perf/cpp/remote_lat.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/perf/cpp/remote_thr.cpp b/perf/cpp/remote_thr.cpp index 3eee16c..4985416 100644 --- a/perf/cpp/remote_thr.cpp +++ b/perf/cpp/remote_thr.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. |