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 /bindings/ruby | |
parent | d10c605fa94a8fe8265785043aeef63983e07f3f (diff) | |
parent | 4f6baf4dde627656b63cc4e2acdb78a8577ba640 (diff) |
fixed failed merge with autogen.sh
Diffstat (limited to 'bindings/ruby')
-rw-r--r-- | bindings/ruby/extconf.rb | 2 | ||||
-rw-r--r-- | bindings/ruby/rbzmq.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb index f931c5e..d5778d0 100644 --- a/bindings/ruby/extconf.rb +++ b/bindings/ruby/extconf.rb @@ -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/ruby/rbzmq.cpp b/bindings/ruby/rbzmq.cpp index 10ff55f..fce749c 100644 --- a/bindings/ruby/rbzmq.cpp +++ b/bindings/ruby/rbzmq.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. |