From: John Hodge <tpg@mutabah.net>
Date: Tue, 6 Aug 2013 04:29:21 +0000 (+0800)
Subject: Merge branch 'master' of git://localhost/acess2
X-Git-Tag: rel0.15~292
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=45ff232a1db704623e0c4baed011d12cbd44b06e;p=tpg%2Facess2.git

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

Conflicts:
	Usermode/Applications/irc_src/main.c
---

45ff232a1db704623e0c4baed011d12cbd44b06e
diff --cc Usermode/Applications/irc_src/main.c
index a348277a,8336879a..09e11641
--- a/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[], 
  	
  	atexit(ExitHandler);
  	
++<<<<<<< HEAD
 +	if( _SysIOCtl(1, DRV_IOCTL_TYPE, NULL) != DRV_TYPE_TERMINAL ) {
 +		printf(stderr, "note: assuming 80x25, can't get terminal dimensions\n");
 +		giTerminal_Width = 80;
 +		giTerminal_Height = 25;
 +	}
 +	else {
 +		struct ptydims	dims;
 +		_SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims);
++=======
+ 	{
+ 		struct ptydims	dims;
+ 		if( _SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims) ) {
+ 			perror("Can't get terminal dimensions");
+ 			return 1;
+ 		}
+ 		
++>>>>>>> e7a76b0d8a0cc6aa77966509780973a6f8216ef7
  		giTerminal_Width = dims.W;
  		giTerminal_Height = dims.H;
  	}