Merge branch 'master' of git://localhost/acess2

Conflicts:
	Usermode/Applications/irc_src/main.c

diff --cc Usermode/Applications/irc_src/main.c
index a348277,8336879..09e1164
--- 1/Usermode/Applications/irc_src/main.c
--- 2/Usermode/Applications/irc_src/main.c
+++ b/Usermode/Applications/irc_src/main.c
@@@ -103,14 -103,13 +103,24 @@@ int main(int argc, const char *argv[], 
        \r
        atexit(ExitHandler);\r
        \r
++<<<<<<< HEAD
 +      if( _SysIOCtl(1, DRV_IOCTL_TYPE, NULL) != DRV_TYPE_TERMINAL ) {\r
 +              printf(stderr, "note: assuming 80x25, can't get terminal dimensions\n");\r
 +              giTerminal_Width = 80;\r
 +              giTerminal_Height = 25;\r
 +      }\r
 +      else {\r
 +              struct ptydims  dims;\r
 +              _SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims);\r
++=======
+       {\r
+               struct ptydims  dims;\r
+               if( _SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims) ) {\r
+                       perror("Can't get terminal dimensions");\r
+                       return 1;\r
+               }\r
+               \r
++>>>>>>> e7a76b0d8a0cc6aa77966509780973a6f8216ef7
                giTerminal_Width = dims.W;\r
                giTerminal_Height = dims.H;\r
        }\r