Merge lp:~markellmtthw/midori/fix-920012 into lp:~vcs-imports/midori/master

[Matthew Markell]

[Cody Garver (codygarver)]

A 2013 branch has been submitted.

review: Disapprove

Unmerged revisions

4489. By Matthew Markell on 2012-02-04

changed copyright notice to 20xx-2012

=== modified file 'katze/gtk3-compat.c'
--- katze/gtk3-compat.c	2011-11-09 21:06:10 +0000
+++ katze/gtk3-compat.c	2012-02-04 14:53:19 +0000
@@ -1,3 +1,14 @@
+/*
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
+
+ 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.
+
+ See the file COPYING for the full license text.
+*/
+
 #include "katze/gtk3-compat.h"
 
 #if !GTK_CHECK_VERSION (3, 2, 0) && !defined (HAVE_HILDON_2_2)

=== modified file 'katze/gtk3-compat.h'
--- katze/gtk3-compat.h	2011-11-28 22:37:34 +0000
+++ katze/gtk3-compat.h	2012-02-04 14:53:19 +0000
@@ -1,3 +1,14 @@
+/*
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
+
+ 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.
+
+ See the file COPYING for the full license text.
+*/
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 

=== modified file 'katze/katze-array.c'
--- katze/katze-array.c	2011-03-05 02:40:10 +0000
+++ katze/katze-array.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2011 Christian Dywan <[e-mail]>
+ Copyright (C) 2008--2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-array.h'
--- katze/katze-array.h	2011-01-19 20:58:26 +0000
+++ katze/katze-array.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-arrayaction.c'
--- katze/katze-arrayaction.c	2011-12-01 19:04:32 +0000
+++ katze/katze-arrayaction.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2009 Enrico Tröger <[e-mail]>
 
  This library is free software; you can redistribute it and/or

=== modified file 'katze/katze-arrayaction.h'
--- katze/katze-arrayaction.h	2010-09-15 02:10:55 +0000
+++ katze/katze-arrayaction.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-http-auth.c'
--- katze/katze-http-auth.c	2011-10-26 18:07:11 +0000
+++ katze/katze-http-auth.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-http-auth.h'
--- katze/katze-http-auth.h	2010-01-17 17:14:48 +0000
+++ katze/katze-http-auth.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-http-cookies-sqlite.c'
--- katze/katze-http-cookies-sqlite.c	2011-10-10 21:22:27 +0000
+++ katze/katze-http-cookies-sqlite.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2011 Alexander Butenko <[e-mail]>
 
  This library is free software; you can redistribute it and/or

=== modified file 'katze/katze-http-cookies-sqlite.h'
--- katze/katze-http-cookies-sqlite.h	2011-10-10 21:22:27 +0000
+++ katze/katze-http-cookies-sqlite.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-http-cookies.c'
--- katze/katze-http-cookies.c	2011-05-04 21:53:45 +0000
+++ katze/katze-http-cookies.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-http-cookies.h'
--- katze/katze-http-cookies.h	2010-01-17 17:14:48 +0000
+++ katze/katze-http-cookies.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-item.c'
--- katze/katze-item.c	2012-01-03 20:28:45 +0000
+++ katze/katze-item.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-item.h'
--- katze/katze-item.h	2010-07-01 21:37:13 +0000
+++ katze/katze-item.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-net.c'
--- katze/katze-net.c	2011-10-28 20:49:10 +0000
+++ katze/katze-net.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-net.h'
--- katze/katze-net.h	2010-09-07 20:39:51 +0000
+++ katze/katze-net.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-preferences.c'
--- katze/katze-preferences.c	2011-12-16 01:06:35 +0000
+++ katze/katze-preferences.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-preferences.h'
--- katze/katze-preferences.h	2011-04-14 01:29:50 +0000
+++ katze/katze-preferences.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-scrolled.c'
--- katze/katze-scrolled.c	2011-11-24 23:59:49 +0000
+++ katze/katze-scrolled.c	2012-02-04 14:53:19 +0000
@@ -1,7 +1,7 @@
 /*
  Copyright (C) 2007 Henrik Hedberg <[e-mail]>
  Copyright (C) 2009 Nadav Wiener <[e-mail]>
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-scrolled.h'
--- katze/katze-scrolled.h	2010-01-17 17:14:48 +0000
+++ katze/katze-scrolled.h	2012-02-04 14:53:19 +0000
@@ -1,7 +1,7 @@
 /*
  Copyright (C) 2007 Henrik Hedberg <[e-mail]>
  Copyright (C) 2009 Nadav Wiener <[e-mail]>
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-separatoraction.c'
--- katze/katze-separatoraction.c	2009-01-28 23:52:27 +0000
+++ katze/katze-separatoraction.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-separatoraction.h'
--- katze/katze-separatoraction.h	2010-01-17 17:14:48 +0000
+++ katze/katze-separatoraction.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-throbber.c'
--- katze/katze-throbber.c	2011-12-14 01:14:54 +0000
+++ katze/katze-throbber.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-throbber.h'
--- katze/katze-throbber.h	2010-05-02 14:11:18 +0000
+++ katze/katze-throbber.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-utils.c'
--- katze/katze-utils.c	2012-01-04 23:01:09 +0000
+++ katze/katze-utils.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/katze-utils.h'
--- katze/katze-utils.h	2011-11-28 22:37:34 +0000
+++ katze/katze-utils.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2009 Dale Whittaker <[e-mail]>
 
  This library is free software; you can redistribute it and/or

=== modified file 'katze/katze.h'
--- katze/katze.h	2011-10-10 21:22:27 +0000
+++ katze/katze.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'katze/midori-uri.vala'
--- katze/midori-uri.vala	2011-11-22 20:57:20 +0000
+++ katze/midori-uri.vala	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2011 Christian Dywan <[e-mail]>
+ Copyright (C) 2011-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/main.c'
--- midori/main.c	2012-01-27 20:42:04 +0000
+++ midori/main.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2008 Dale Whittaker <[e-mail]>
 
  This library is free software; you can redistribute it and/or

=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2012-01-24 22:57:40 +0000
+++ midori/midori-app.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-app.h'
--- midori/midori-app.h	2011-10-28 20:49:10 +0000
+++ midori/midori-app.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-array.c'
--- midori/midori-array.c	2012-01-03 20:15:19 +0000
+++ midori/midori-array.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-array.h'
--- midori/midori-array.h	2012-01-03 20:15:19 +0000
+++ midori/midori-array.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2012-01-27 20:42:04 +0000
+++ midori/midori-browser.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2011 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2008 Dale Whittaker <[e-mail]>
  Copyright (C) 2009 Jérôme Geulfucci <[e-mail]>
 

=== modified file 'midori/midori-browser.h'
--- midori/midori-browser.h	2011-04-30 10:17:55 +0000
+++ midori/midori-browser.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-extension.c'
--- midori/midori-extension.c	2011-11-08 21:42:03 +0000
+++ midori/midori-extension.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2009 Dale Whittaker <[e-mail]>
 
  This library is free software; you can redistribute it and/or

=== modified file 'midori/midori-extension.h'
--- midori/midori-extension.h	2011-06-07 19:02:09 +0000
+++ midori/midori-extension.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-extensions-column.vala'
--- midori/midori-extensions-column.vala	2011-10-30 13:09:12 +0000
+++ midori/midori-extensions-column.vala	2012-02-04 14:53:19 +0000
@@ -1,3 +1,13 @@
+/*
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
+
+ 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.
+
+ See the file COPYING for the full license text.
+*/
 
 public class Midori.ExtensionsColumn : Gtk.TreeViewColumn {
     public signal void row_clicked (Gtk.TreeView view, Gtk.TreePath path);

=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2012-01-24 22:57:40 +0000
+++ midori/midori-locationaction.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2008-2010 Dale Whittaker <[e-mail]>
 
  This library is free software; you can redistribute it and/or

=== modified file 'midori/midori-locationaction.h'
--- midori/midori-locationaction.h	2010-07-31 11:59:48 +0000
+++ midori/midori-locationaction.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-panel.c'
--- midori/midori-panel.c	2011-11-20 21:14:30 +0000
+++ midori/midori-panel.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-panel.h'
--- midori/midori-panel.h	2010-09-07 20:24:11 +0000
+++ midori/midori-panel.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-platform.h'
--- midori/midori-platform.h	2011-10-31 21:18:06 +0000
+++ midori/midori-platform.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2010-2011 Christian Dywan <[e-mail]>
+ Copyright (C) 2010-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2012-01-03 21:45:21 +0000
+++ midori/midori-preferences.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-preferences.h'
--- midori/midori-preferences.h	2010-01-17 17:14:48 +0000
+++ midori/midori-preferences.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-searchaction.c'
--- midori/midori-searchaction.c	2012-01-13 23:34:11 +0000
+++ midori/midori-searchaction.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-searchaction.h'
--- midori/midori-searchaction.h	2011-05-01 16:49:09 +0000
+++ midori/midori-searchaction.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-stock.h'
--- midori/midori-stock.h	2011-10-31 21:18:06 +0000
+++ midori/midori-stock.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2012-01-29 18:14:24 +0000
+++ midori/midori-view.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2009 Jean-François Guchens <[e-mail]>
 
  This library is free software; you can redistribute it and/or

=== modified file 'midori/midori-view.h'
--- midori/midori-view.h	2011-12-14 00:37:14 +0000
+++ midori/midori-view.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-viewable.c'
--- midori/midori-viewable.c	2010-09-12 19:03:14 +0000
+++ midori/midori-viewable.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-viewable.h'
--- midori/midori-viewable.h	2010-09-12 19:03:14 +0000
+++ midori/midori-viewable.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c	2012-01-03 21:45:21 +0000
+++ midori/midori-websettings.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2011 Peter Hatina <[e-mail]>
 
  This library is free software; you can redistribute it and/or

=== modified file 'midori/midori-websettings.h'
--- midori/midori-websettings.h	2011-11-16 23:03:52 +0000
+++ midori/midori-websettings.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori.h'
--- midori/midori.h	2011-10-31 21:18:06 +0000
+++ midori/midori.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2011-11-08 00:53:53 +0000
+++ midori/midori.vapi	2012-02-04 14:53:19 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Christian Dywan <[e-mail]>
+/* Copyright (C) 2010-2012 Christian Dywan <[e-mail]>
    This file is licensed under the terms of the expat license, see the file EXPAT. */
 
 [CCode (cprefix = "Midori", lower_case_cprefix = "midori_")]

=== modified file 'midori/sokoke.c'
--- midori/sokoke.c	2012-01-13 23:34:11 +0000
+++ midori/sokoke.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2011 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2009 Dale Whittaker <[e-mail]>
  Copyright (C) 2009 Alexander Butenko <[e-mail]>
 

=== modified file 'midori/sokoke.h'
--- midori/sokoke.h	2012-01-13 23:34:11 +0000
+++ midori/sokoke.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2007-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2009 Dale Whittaker <[e-mail]>
 
  This library is free software; you can redistribute it and/or

=== modified file 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c	2012-01-13 23:45:01 +0000
+++ panels/midori-bookmarks.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'panels/midori-bookmarks.h'
--- panels/midori-bookmarks.h	2011-10-31 21:18:06 +0000
+++ panels/midori-bookmarks.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'panels/midori-extensions.c'
--- panels/midori-extensions.c	2011-11-09 21:06:11 +0000
+++ panels/midori-extensions.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'panels/midori-extensions.h'
--- panels/midori-extensions.h	2008-12-04 00:44:33 +0000
+++ panels/midori-extensions.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'panels/midori-history.c'
--- panels/midori-history.c	2012-01-13 23:45:01 +0000
+++ panels/midori-history.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'panels/midori-history.h'
--- panels/midori-history.h	2009-02-21 22:59:02 +0000
+++ panels/midori-history.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'panels/midori-transfers.c'
--- panels/midori-transfers.c	2011-11-09 21:06:11 +0000
+++ panels/midori-transfers.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'panels/midori-transfers.h'
--- panels/midori-transfers.h	2009-03-22 14:25:57 +0000
+++ panels/midori-transfers.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'tests/browser.c'
--- tests/browser.c	2011-11-08 21:42:02 +0000
+++ tests/browser.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'tests/extensions.c'
--- tests/extensions.c	2011-11-17 23:55:19 +0000
+++ tests/extensions.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'tests/magic-uri.c'
--- tests/magic-uri.c	2011-11-18 00:44:48 +0000
+++ tests/magic-uri.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
  Copyright (C) 2009 Alexander Butenko <[e-mail]>
 
  This library is free software; you can redistribute it and/or

=== modified file 'tests/properties.c'
--- tests/properties.c	2011-11-08 21:42:03 +0000
+++ tests/properties.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'toolbars/midori-findbar.c'
--- toolbars/midori-findbar.c	2012-01-13 23:45:01 +0000
+++ toolbars/midori-findbar.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2008-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'toolbars/midori-findbar.h'
--- toolbars/midori-findbar.h	2011-10-13 16:31:50 +0000
+++ toolbars/midori-findbar.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2010-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'toolbars/midori-transferbar.c'
--- toolbars/midori-transferbar.c	2011-11-07 23:28:07 +0000
+++ toolbars/midori-transferbar.c	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2010-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'toolbars/midori-transferbar.h'
--- toolbars/midori-transferbar.h	2010-06-17 18:17:21 +0000
+++ toolbars/midori-transferbar.h	2012-02-04 14:53:19 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2010 Christian Dywan <[e-mail]>
+ Copyright (C) 2010-2012 Christian Dywan <[e-mail]>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public