diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-04-26 00:59:49 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-04-26 00:59:49 +0200 |
| commit | 6564651bcd196f7f0fa263db83d0775974bf4a1c (patch) | |
| tree | 6e329acf64c71c0a576cda02def2c77189ed7982 /debian/copyright | |
| parent | ace27c4a149b0b7d115c2ce1fee358386fb03eaf (diff) | |
| parent | 3590ecd60a4ce1f99f5d4c07d787dc134904894a (diff) | |
| download | lightdm-remote-session-x2go-6564651bcd196f7f0fa263db83d0775974bf4a1c.tar.gz lightdm-remote-session-x2go-6564651bcd196f7f0fa263db83d0775974bf4a1c.tar.bz2 lightdm-remote-session-x2go-6564651bcd196f7f0fa263db83d0775974bf4a1c.zip | |
Merge branch 'x2gosessiontype'
Conflicts (resolved by Mike Gabriel):
debian/changelog
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/debian/copyright b/debian/copyright index 086c43f..9ab1749 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,14 @@ Upstream-Name: lightdm-remote-session-x2go Source: http://code.x2go.org/gitweb?p=lightdm-remote-session-x2go.git;a=summary Files: * -Copyright: 2012, Canonical Ltd. +Copyright: + 2012-2013, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de> + 2012, Canonical Ltd. License: GPL-3 Files: debian/* Copyright: - 2012, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de> + 2012-2013, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de> 2012, Canonical Ltd. License: GPL-3 |