summaryrefslogtreecommitdiff
path: root/perf
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-11-04 09:48:25 +0100
committerMartin Sustrik <sustrik@250bpm.com>2011-11-04 09:48:25 +0100
commit05ce301f3571e3e690792a189cb927328163f0bc (patch)
tree1145b921033a2b88e9b987ec1d3e03060559702d /perf
parenta8362abf11b51dd553766fb07a9e60f28e788126 (diff)
parent6cdd720400ea456ccbfdf09cdc5054ab07dbdc6f (diff)
Merge branch 'master' of github.com:zeromq/libzmq
Diffstat (limited to 'perf')
-rw-r--r--perf/inproc_lat.cpp3
-rw-r--r--perf/inproc_thr.cpp3
-rw-r--r--perf/local_lat.cpp3
-rw-r--r--perf/local_thr.cpp3
-rw-r--r--perf/remote_lat.cpp3
-rw-r--r--perf/remote_thr.cpp3
6 files changed, 12 insertions, 6 deletions
diff --git a/perf/inproc_lat.cpp b/perf/inproc_lat.cpp
index 7c15013..5b6a830 100644
--- a/perf/inproc_lat.cpp
+++ b/perf/inproc_lat.cpp
@@ -1,5 +1,6 @@
/*
- Copyright (c) 2007-2011 iMatix Corporation
+ Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
This file is part of 0MQ.
diff --git a/perf/inproc_thr.cpp b/perf/inproc_thr.cpp
index 4673eba..b4cadfc 100644
--- a/perf/inproc_thr.cpp
+++ b/perf/inproc_thr.cpp
@@ -1,5 +1,6 @@
/*
- Copyright (c) 2007-2011 iMatix Corporation
+ Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
This file is part of 0MQ.
diff --git a/perf/local_lat.cpp b/perf/local_lat.cpp
index 999e799..714b8c0 100644
--- a/perf/local_lat.cpp
+++ b/perf/local_lat.cpp
@@ -1,5 +1,6 @@
/*
- Copyright (c) 2007-2011 iMatix Corporation
+ Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
This file is part of 0MQ.
diff --git a/perf/local_thr.cpp b/perf/local_thr.cpp
index a21707f..5c495d8 100644
--- a/perf/local_thr.cpp
+++ b/perf/local_thr.cpp
@@ -1,5 +1,6 @@
/*
- Copyright (c) 2007-2011 iMatix Corporation
+ Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
This file is part of 0MQ.
diff --git a/perf/remote_lat.cpp b/perf/remote_lat.cpp
index 0d438e9..9eb76b0 100644
--- a/perf/remote_lat.cpp
+++ b/perf/remote_lat.cpp
@@ -1,5 +1,6 @@
/*
- Copyright (c) 2007-2011 iMatix Corporation
+ Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
This file is part of 0MQ.
diff --git a/perf/remote_thr.cpp b/perf/remote_thr.cpp
index c8df333..328bdce 100644
--- a/perf/remote_thr.cpp
+++ b/perf/remote_thr.cpp
@@ -1,5 +1,6 @@
/*
- Copyright (c) 2007-2011 iMatix Corporation
+ Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
This file is part of 0MQ.