summaryrefslogtreecommitdiff
path: root/perf/java
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 /perf/java
parentd10c605fa94a8fe8265785043aeef63983e07f3f (diff)
parent4f6baf4dde627656b63cc4e2acdb78a8577ba640 (diff)
fixed failed merge with autogen.sh
Diffstat (limited to 'perf/java')
-rw-r--r--perf/java/local_lat.java2
-rw-r--r--perf/java/local_thr.java2
-rw-r--r--perf/java/remote_lat.java2
-rw-r--r--perf/java/remote_thr.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/perf/java/local_lat.java b/perf/java/local_lat.java
index 873f636..d886d4f 100644
--- a/perf/java/local_lat.java
+++ b/perf/java/local_lat.java
@@ -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/java/local_thr.java b/perf/java/local_thr.java
index 2881a08..171b169 100644
--- a/perf/java/local_thr.java
+++ b/perf/java/local_thr.java
@@ -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/java/remote_lat.java b/perf/java/remote_lat.java
index 905b82c..1db0520 100644
--- a/perf/java/remote_lat.java
+++ b/perf/java/remote_lat.java
@@ -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/java/remote_thr.java b/perf/java/remote_thr.java
index f696fc3..f1b5124 100644
--- a/perf/java/remote_thr.java
+++ b/perf/java/remote_thr.java
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2007-2009 FastMQ Inc.
+ Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.