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 /x2go-session.in | |
| 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 'x2go-session.in')
| -rwxr-xr-x | x2go-session.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/x2go-session.in b/x2go-session.in index 1b3c739..787f163 100755 --- a/x2go-session.in +++ b/x2go-session.in @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright © 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright © 2012-2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Copyright © 2012 Canonical Ltd. # # This program is free software: you can redistribute it and/or modify it |