openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/resource-patch-update into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Just some behind-the-scenes house keeping.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/resource-patch-update/+merge/35031
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/resource-patch-update into lp:openlp.

=== modified file 'openlp/core/resources.py'
--- openlp/core/resources.py	2010-09-07 20:42:33 +0000
+++ openlp/core/resources.py	2010-09-09 19:55:59 +0000
@@ -6,8 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Thompson, Jon Tibble, Carsten Tinggaard                                     #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Carsten Tinggaard, Frode Woldsund                                           #
 # --------------------------------------------------------------------------- #
 # 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  #

=== modified file 'scripts/resources.patch'
--- scripts/resources.patch	2010-06-21 23:26:35 +0000
+++ scripts/resources.patch	2010-09-09 19:55:59 +0000
@@ -1,6 +1,6 @@
 --- openlp/core/resources.py.old	Mon Jun 21 23:16:19 2010
 +++ openlp/core/resources.py	Mon Jun 21 23:27:48 2010
-@@ -1,10 +1,31 @@
+@@ -1,10 +1,32 @@
  # -*- coding: utf-8 -*-
 +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
  
@@ -14,8 +14,9 @@
 +# --------------------------------------------------------------------------- #
 +# Copyright (c) 2008-2010 Raoul Snyman                                        #
 +# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
++# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
++# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
++# Carsten Tinggaard, Frode Woldsund                                           #
 +# --------------------------------------------------------------------------- #
 +# 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  #