[poppler] Branch 'poppler-0.14' - goo/gfile.cc goo/GooTimer.cc goo/GooTimer.h poppler/DCTStream.cc poppler/DCTStream.h

[Albert Astals Cid]

 goo/GooTimer.cc      |    1 +
 goo/GooTimer.h       |    1 +
 goo/gfile.cc         |    2 +-
 poppler/DCTStream.cc |    1 +
 poppler/DCTStream.h  |    1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c9c0abf17de9f1815df46451ddba268187ce0aa8
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Aug 10 18:44:55 2010 +0100

    Update copyrights

diff --git a/goo/GooTimer.cc b/goo/GooTimer.cc
index 0f4ccfe..c766c6b 100644
--- a/goo/GooTimer.cc
+++ b/goo/GooTimer.cc
@@ -6,6 +6,7 @@
 //
 // Copyright 2005 Jonathan Blandford <jrb at redhat.com>
 // Copyright 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+// Copyright 2010 Hib Eris <hib at hiberis.nl>
 // Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team
 //
 //========================================================================
diff --git a/goo/GooTimer.h b/goo/GooTimer.h
index 864bf68..f55ffcc 100755
--- a/goo/GooTimer.h
+++ b/goo/GooTimer.h
@@ -6,6 +6,7 @@
 //
 // Copyright 2005 Jonathan Blandford <jrb at redhat.com>
 // Copyright 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+// Copyright 2010 Hib Eris <hib at hiberis.nl>
 // Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team
 //
 //========================================================================
diff --git a/goo/gfile.cc b/goo/gfile.cc
index ff23aae..f48f9f3 100644
--- a/goo/gfile.cc
+++ b/goo/gfile.cc
@@ -18,7 +18,7 @@
 // Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
 // Copyright (C) 2006 Kristian Høgsberg <krh at redhat.com>
 // Copyright (C) 2008 Adam Batkin <adam at batkin.net>
-// Copyright (C) 2008 Hib Eris <hib at hiberis.nl>
+// Copyright (C) 2008, 2010 Hib Eris <hib at hiberis.nl>
 // Copyright (C) 2009 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
 //
diff --git a/poppler/DCTStream.cc b/poppler/DCTStream.cc
index 2261cb3..b3f2846 100644
--- a/poppler/DCTStream.cc
+++ b/poppler/DCTStream.cc
@@ -7,6 +7,7 @@
 // Copyright 2005 Jeff Muizelaar <jeff at infidigm.net>
 // Copyright 2005-2010 Albert Astals Cid <aacid at kde.org>
 // Copyright 2009 Ryszard Trojnacki <rysiek at menel.com>
+// Copyright 2010 Carlos Garcia Campos <carlosgc at gnome.org>
 //
 //========================================================================
 
diff --git a/poppler/DCTStream.h b/poppler/DCTStream.h
index 81c18e9..02d45f2 100644
--- a/poppler/DCTStream.h
+++ b/poppler/DCTStream.h
@@ -7,6 +7,7 @@
 // Copyright 2005 Jeff Muizelaar <jeff at infidigm.net>
 // Copyright 2005 Martin Kretzschmar <martink at gnome.org>
 // Copyright 2005-2007, 2009, 2010 Albert Astals Cid <aacid at kde.org>
+// Copyright 2010 Carlos Garcia Campos <carlosgc at gnome.org>
 //
 //========================================================================