Show
Ignore:
Timestamp:
12/12/07 09:44:46 (12 months ago)
Author:
asterix
Message:

merge diff from trunk

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/pep/src/common/check_paths.py

    r8478 r9123  
    11## 
    2 ## Copyright (C) 2005-2006 Yann Le Boulanger <asterix@lagaule.org> 
     2## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org> 
    33## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com> 
    44## Copyright (C) 2005-2006 Travis Shirk <travis@pobox.com> 
    55## 
    6 ## This program is free software; you can redistribute it and/or modify 
     6## This file is part of Gajim. 
     7## 
     8## Gajim is free software; you can redistribute it and/or modify 
    79## it under the terms of the GNU General Public License as published 
    8 ## by the Free Software Foundation; version 2 only. 
     10## by the Free Software Foundation; version 3 only. 
    911## 
    10 ## This program is distributed in the hope that it will be useful, 
     12## Gajim is distributed in the hope that it will be useful, 
    1113## but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1214## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1315## GNU General Public License for more details. 
     16## 
     17## You should have received a copy of the GNU General Public License 
     18## along with Gajim.  If not, see <http://www.gnu.org/licenses/>. 
    1419## 
    1520 
    … …  
    123128                        print _('Gajim will now exit') 
    124129                        sys.exit() 
    125  
     130                 
    126131        else: # dot_gajim doesn't exist 
    127132                if dot_gajim: # is '' on win9x so avoid that