diff options
author | Dave Brolley <brolley@redhat.com> | 2008-08-29 16:10:01 -0400 |
---|---|---|
committer | Dave Brolley <brolley@redhat.com> | 2008-08-29 16:10:01 -0400 |
commit | 0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c (patch) | |
tree | add6c27ae60763af4c4a1aa90db7f65e465759e3 /hash.cxx | |
parent | d1f2fc72bf8506d0ac166cddb07576c7c4a1fea6 (diff) | |
parent | 8d142c018986acb256a08c1232f4f5ff0ee063df (diff) | |
download | systemtap-steved-0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c.tar.gz systemtap-steved-0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c.tar.xz systemtap-steved-0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c.zip |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
ChangeLog
Diffstat (limited to 'hash.cxx')
-rw-r--r-- | hash.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,16 +1,16 @@ // Copyright (C) Andrew Tridgell 2002 (original file) // Copyright (C) 2006-2008 Red Hat Inc. (systemtap changes) -// +// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. -// +// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |