summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-17 17:47:04 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-17 18:04:55 +0200
commitcceec9213e28cf6a93d8fb9010536282f6d462b8 (patch)
treecff459828491b2ba7e2b548bc986fc017f5ccdba
parentf56f3b98e23cff93fdfef0c308b48dda25879cd0 (diff)
datetime: sync header with Empathy
empathy-time has been relicensed to LGPL: http://git.gnome.org/browse/empathy/commit/?id=aeb4b0095d9685e8c40e4a86144f214caf3c63e8 http://git.gnome.org/browse/empathy/commit/?id=ae842e153796a77dccc171254625793acf754c3f
-rw-r--r--telepathy-logger/datetime-internal.h22
-rw-r--r--telepathy-logger/datetime.c20
2 files changed, 22 insertions, 20 deletions
diff --git a/telepathy-logger/datetime-internal.h b/telepathy-logger/datetime-internal.h
index 77b4d2035..681191094 100644
--- a/telepathy-logger/datetime-internal.h
+++ b/telepathy-logger/datetime-internal.h
@@ -1,21 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2004 Imendio AB
+ * Copyright (C) 2007-2010 Collabora Ltd.
*
- * 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 library 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.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library 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.
+ * Lesser 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 St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Authors: Richard Hult <richard@imendio.com>
*/
#ifndef __TPL_TIME_H__
diff --git a/telepathy-logger/datetime.c b/telepathy-logger/datetime.c
index d4a020541..999b9e82a 100644
--- a/telepathy-logger/datetime.c
+++ b/telepathy-logger/datetime.c
@@ -1,21 +1,21 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2003-2007 Imendio AB
+ * Copyright (C) 2007-2010 Collabora Ltd.
*
- * 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 library 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.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library 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.
+ * Lesser 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 St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors: Richard Hult <richard@imendio.com>
*/