diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2011-11-04 09:48:25 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2011-11-04 09:48:25 +0100 |
| commit | 05ce301f3571e3e690792a189cb927328163f0bc (patch) | |
| tree | 1145b921033a2b88e9b987ec1d3e03060559702d /src/atomic_ptr.hpp | |
| parent | a8362abf11b51dd553766fb07a9e60f28e788126 (diff) | |
| parent | 6cdd720400ea456ccbfdf09cdc5054ab07dbdc6f (diff) | |
Merge branch 'master' of github.com:zeromq/libzmq
Diffstat (limited to 'src/atomic_ptr.hpp')
| -rw-r--r-- | src/atomic_ptr.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp index c106cd5..c59ab81 100644 --- a/src/atomic_ptr.hpp +++ b/src/atomic_ptr.hpp @@ -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. |