Telepathy KDE

Merge lp:~murthy/telepathy-kde/ktp-desktop-applets-ubuntu into lp:~telepathy-kde/telepathy-kde/ktp-desktop-applets-ubuntu

  1. ktp-desktop-applets-ubuntu
  2. Merge into ktp-desktop-applets-ubuntu
Proposed by Prasad Murthy
Status: Merged
Merged at revision: 3
Proposed branch: lp:~murthy/telepathy-kde/ktp-desktop-applets-ubuntu
Merge into: lp:~telepathy-kde/telepathy-kde/ktp-desktop-applets-ubuntu
Diff against target: 30 lines (+5/-10)
1 file modified
debian/copyright (+5/-10)
To merge this branch: bzr merge lp:~murthy/telepathy-kde/ktp-desktop-applets-ubuntu
Reviewer Review Type Date Requested Status
Rohan Garg Pending
Review via email: mp+149414@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/copyright'
2--- debian/copyright 2013-02-04 14:05:01 +0000
3+++ debian/copyright 2013-02-19 21:30:41 +0000
4@@ -5,21 +5,16 @@
5 License: GPL-2+
6
7 Files: *
8- contact/src/contact-delegate.*
9+Copyright: 2011 Francesco Nwokeka <francesco.nwokeka@gmail.com>
10+License: GPL-2+
11+
12+Files: contact/src/contact-delegate.*
13 contact/src/abstract-contact-delegate.*
14 Copyright: 2013 Dan Vrátil <dvratil@redhat.com>
15 2011 Martin Klapetek <martin.klapetek@gmail.com>
16 License: LGPL-2.1+
17
18-Files: contactlist/*
19- presence/*
20- contact/src/declarative/contents/ui/*
21- contact/src/telepathy-contact.*
22- contact/src/contact-wrapper.*
23- contact/src/applet_config.*
24- contact/src/declarative/*
25-Copyright: 2011 Francesco Nwokeka <francesco.nwokeka@gmail.com>
26-License: GPL-2+
27+
28
29 Files: cmake/*
30 Copyright: 2011 Dario Freddi <drf@kde.org>

Subscribers

People subscribed via source and target branches

to all changes: