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/python | |
parent | d10c605fa94a8fe8265785043aeef63983e07f3f (diff) | |
parent | 4f6baf4dde627656b63cc4e2acdb78a8577ba640 (diff) |
fixed failed merge with autogen.sh
Diffstat (limited to 'perf/python')
-rw-r--r-- | perf/python/local_lat.py | 2 | ||||
-rw-r--r-- | perf/python/local_thr.py | 2 | ||||
-rw-r--r-- | perf/python/remote_lat.py | 2 | ||||
-rw-r--r-- | perf/python/remote_thr.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/perf/python/local_lat.py b/perf/python/local_lat.py index e9d46e0..bc1d804 100644 --- a/perf/python/local_lat.py +++ b/perf/python/local_lat.py @@ -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/python/local_thr.py b/perf/python/local_thr.py index 26896d0..395376c 100644 --- a/perf/python/local_thr.py +++ b/perf/python/local_thr.py @@ -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/python/remote_lat.py b/perf/python/remote_lat.py index 29bd550..52ab061 100644 --- a/perf/python/remote_lat.py +++ b/perf/python/remote_lat.py @@ -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/python/remote_thr.py b/perf/python/remote_thr.py index f7c69cf..5fb8a2b 100644 --- a/perf/python/remote_thr.py +++ b/perf/python/remote_thr.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # |