resolved a cvs conflict.

svn path=/trunk/kdebase/konsole/; revision=39006

CONTRIBUTORS

@@ -1,6 +1,4 @@
 CONTRIBUTORS. See ChangeLog also
-- Dan Pilone <pilone@slac.com>
-  - SGI Port
 - Warwick Allison <warwick@troll.no>
   - 16 color SGR codes (xterm-83)
   - schema files seeked also in ~/.kde/share/apps/konsole
@@ -25,10 +23,12 @@ CONTRIBUTORS. See ChangeLog also
   - bug fixing
 - Antonio Larrosa <larrosa@kde.org>
   - transparency/tint
+- Dan Pilone <pilone@slac.com>
+  - SGI Port
 - Peter Silva <peter.silva@videotron.ca>
   - bug fixing
   - decent marking
 - Kevin Street <street@iname.com>
   - FreeBSD port
 - Lotzi Boloni <boloni@cs.purdue.edu>
-  -Fast switch between sessions with the same schema.
+  - Fast switch between sessions with the same schema.

ChangeLog

@@ -1,3 +1,5 @@
+19 Jan 2000
+- fixed a size problem with OSF/1 v3.2
 16 Jan 2000
 - added privacy code 1049.
 - reverted to TERM=xterm.

include/TEShell.h

@@ -16,6 +16,7 @@
 #ifndef SHELL_H
 #define SHELL_H
 
+#include <config.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
@@ -84,6 +85,8 @@ Q_OBJECT
 
   private:
 
+    struct winsize wsize;
+
     int              fd;
     pid_t            comm_pid;
     QSocketNotifier* mn;
@@ -91,8 +94,6 @@ Q_OBJECT
     bool             needGrantPty;
     char ptynam[50]; // "/dev/ptyxx" | "/dev/ptmx"
     char ttynam[50]; // "/dev/ttyxx" | "/dev/pts/########..."
-    
-    winsize wsize;
 };
 
 #endif