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/atom_window.py

    r7848 r9123  
    44## one from pubsub.com. 
    55## 
    6 ## Copyright (C) 2006-2007 Yann Le Boulanger <asterix@lagaule.org> 
     6## Copyright (C) 2006-2007 Yann Leboulanger <asterix@lagaule.org> 
    77## Copyright (C) 2007 Nikos Kouremenos <kourem@gmail.com> 
    88## Copyright (C) 2006-2007 Liori (I think) put ur self here please 
    99## 
    10 ## This program is free software; you can redistribute it and/or modify 
     10## This file is part of Gajim. 
     11## 
     12## Gajim is free software; you can redistribute it and/or modify 
    1113## it under the terms of the GNU General Public License as published 
    12 ## by the Free Software Foundation; version 2 only. 
     14## by the Free Software Foundation; version 3 only. 
    1315## 
    14 ## This program is distributed in the hope that it will be useful, 
     16## Gajim is distributed in the hope that it will be useful, 
    1517## but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1618## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1719## GNU General Public License for more details. 
     20## 
     21## You should have received a copy of the GNU General Public License 
     22## along with Gajim.  If not, see <http://www.gnu.org/licenses/>. 
    1823## 
    1924