Merge lp:~submarine/unity-scope-texdoc/bug1260105 into lp:unity-scope-texdoc

Proposed by Mark Tully
Status: Merged
Approved by: David Callé
Approved revision: 26
Merged at revision: 26
Proposed branch: lp:~submarine/unity-scope-texdoc/bug1260105
Merge into: lp:unity-scope-texdoc
Diff against target: 29 lines (+6/-2)
2 files modified
debian/copyright (+3/-1)
src/unity_texdoc_daemon.py (+3/-1)
To merge this branch: bzr merge lp:~submarine/unity-scope-texdoc/bug1260105
Reviewer Review Type Date Requested Status
David Callé (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+199064@code.launchpad.net

Commit message

Fix copyright attributions

Description of the change

Fixes the copyright attribution issue described in bug 1261015

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
David Callé (davidc3) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/copyright'
--- debian/copyright 2013-03-13 13:14:52 +0000
+++ debian/copyright 2013-12-16 01:04:45 +0000
@@ -4,7 +4,9 @@
4Upstream-Contact: Mark Tully <markjtully@gmail.com>4Upstream-Contact: Mark Tully <markjtully@gmail.com>
55
6Files: *6Files: *
7Copyright: 2013 Mark Tully7Copyright: 2012 Frederik Elwert <frederik.elwert@web.de>
8 2012 Pawel Stolowski <stolowski@gmail.com>
9 2012 Mark Tully <markjtully@gmail.com>
8License: GPL-310License: GPL-3
9 This program is free software: you can redistribute it and/or modify11 This program is free software: you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by12 it under the terms of the GNU General Public License as published by
1113
=== modified file 'src/unity_texdoc_daemon.py'
--- src/unity_texdoc_daemon.py 2013-03-19 22:29:12 +0000
+++ src/unity_texdoc_daemon.py 2013-12-16 01:04:45 +0000
@@ -1,7 +1,9 @@
1#! /usr/bin/python31#! /usr/bin/python3
2# -*- coding: utf-8 -*-2# -*- coding: utf-8 -*-
33
4# Copyright(C) 2013 Mark Tully <markjtully@gmail.com>4# Copyright(C) 2012 Frederik Elwert <frederik.elwert@web.de>
5# 2012 Pawel Stolowski <stolowski@gmail.com>
6# 2012 Mark Tully <markjtully@gmail.com>
5# This program is free software: you can redistribute it and/or modify it7# This program is free software: you can redistribute it and/or modify it
6# under the terms of the GNU General Public License version 3, as published8# under the terms of the GNU General Public License version 3, as published
7# by the Free Software Foundation.9# by the Free Software Foundation.

Subscribers

People subscribed via source and target branches