diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
| commit | c0a255eb90769638d57ae4122932f75c46e4e531 (patch) | |
| tree | 5213694107a246763c25c0a089553dd7c8708b32 /plugins/profiler | |
| parent | 4c8aa5982c0132716f473873d0e1d7601df14607 (diff) | |
| download | gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.gz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.zst gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.zip | |
Merge revisions 36016:36303 from trunk.
svn path=/branches/kill-bonobo/; revision=36307
Diffstat (limited to 'plugins/profiler')
| -rw-r--r-- | plugins/profiler/ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/profiler/profiler.c | 27 |
2 files changed, 20 insertions, 13 deletions
diff --git a/plugins/profiler/ChangeLog b/plugins/profiler/ChangeLog index 50dfdf6e80..16b77d5ba6 100644 --- a/plugins/profiler/ChangeLog +++ b/plugins/profiler/ChangeLog @@ -1,3 +1,9 @@ +2008-09-02 Sankar P <psankar@novell.com> + +License Changes + + * profiler.c: + 2007-10-26 Kjartan Maraas <kmaraas@gnome.org> * profiler.c: Add missing includes. diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c index 3948011c9c..6f52759e82 100644 --- a/plugins/profiler/profiler.c +++ b/plugins/profiler/profiler.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Author: Michael Zucchi <notzed@novell.com> + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * Authors: + * Michael Zucchi <notzed@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ |