Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 2 insertions, 2 deletions

diff --git a/library/process_unix.cpp b/library/process_unix.cpp
index b599edb..e0fbf8c 100644
--- a/library/process_unix.cpp
+++ b/library/process_unix.cpp
@@ -1,52 +1,52 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef QT_H
 # include <qfeatures.h>
 #endif // QT_H
 
 #ifndef QT_NO_PROCESS
 
 //#include "qplatformdefs.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <fcntl.h>
 
 #include "process.h"
 #include "qapplication.h"
 //#include "qptrqueue.h"
 //#include "qptrlist.h"
 #include "qsocketnotifier.h"
 #include "qtimer.h"
 //#include "qcleanuphandler.h"
 #include "qregexp.h"
 
 #include <stdlib.h>
 #include <errno.h>
 
 #define QPtrList QList
 
 //#define QT_QPROCESS_DEBUG
 
 
 class Proc;