summaryrefslogtreecommitdiff
path: root/bindings/java/org
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 /bindings/java/org
parentd10c605fa94a8fe8265785043aeef63983e07f3f (diff)
parent4f6baf4dde627656b63cc4e2acdb78a8577ba640 (diff)
fixed failed merge with autogen.sh
Diffstat (limited to 'bindings/java/org')
-rw-r--r--bindings/java/org/zmq/Context.java2
-rw-r--r--bindings/java/org/zmq/Socket.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/bindings/java/org/zmq/Context.java b/bindings/java/org/zmq/Context.java
index 408c6b0..3c00ba8 100644
--- a/bindings/java/org/zmq/Context.java
+++ b/bindings/java/org/zmq/Context.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/bindings/java/org/zmq/Socket.java b/bindings/java/org/zmq/Socket.java
index 075e322..1b427c3 100644
--- a/bindings/java/org/zmq/Socket.java
+++ b/bindings/java/org/zmq/Socket.java
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2007-2009 FastMQ Inc.
+ Copyright (c) 2007-2010 iMatix Corporation
This file is part of 0MQ.