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 /examples/chat | |
| parent | d10c605fa94a8fe8265785043aeef63983e07f3f (diff) | |
| parent | 4f6baf4dde627656b63cc4e2acdb78a8577ba640 (diff) | |
fixed failed merge with autogen.sh
Diffstat (limited to 'examples/chat')
| -rwxr-xr-x | examples/chat/display.cpp | 2 | ||||
| -rw-r--r-- | examples/chat/prompt.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/chat/display.cpp b/examples/chat/display.cpp index d04e90b..d3488a2 100755 --- a/examples/chat/display.cpp +++ b/examples/chat/display.cpp @@ -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/examples/chat/prompt.cpp b/examples/chat/prompt.cpp index 72b0195..540ac16 100644 --- a/examples/chat/prompt.cpp +++ b/examples/chat/prompt.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. |