diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-29 16:35:50 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-29 16:35:50 (GMT) |
commit | ff2bee3d9b560148472633381f6dd74d2ebf24ba (patch) | |
tree | ed9b9884e0deb9f5ee675eb1555d4857156ef28b | |
parent | 28f5de3deba2915ef0a926cc4113a834bd502301 (diff) | |
parent | 4071b1970e1027ac882d2dcd270ff67e82502d07 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
-rw-r--r-- | services/nm/sugar-nm-applet | 2 | ||||
-rwxr-xr-x | services/presence/sugar-presence-service | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/services/nm/sugar-nm-applet b/services/nm/sugar-nm-applet index cef78f4..c84e804 100644 --- a/services/nm/sugar-nm-applet +++ b/services/nm/sugar-nm-applet @@ -1,4 +1,4 @@ -#! /bin/env python +#!/usr/bin/python # vi: ts=4 ai noet # # Copyright (C) 2006, Red Hat, Inc. diff --git a/services/presence/sugar-presence-service b/services/presence/sugar-presence-service index b2261b4..fc42e31 100755 --- a/services/presence/sugar-presence-service +++ b/services/presence/sugar-presence-service @@ -1,4 +1,22 @@ #!/usr/bin/python +# vi: ts=4 ai noet +# +# Copyright (C) 2006, Red Hat, Inc. +# +# 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 Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + import logging import sys import os |