[frontierkernel-commits] Frontier/Common/resources/Mac SHELL.R,1.4,1.4.2.1 kernvelverbs.r,1.2.2.1,1.2.2.2

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/resources/Mac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9186/Common/resources/Mac

Modified Files:
      Tag: New_Tables_Experiment-branch
	SHELL.R kernvelverbs.r 
Log Message:
merged trunk, from merged-Root-of-New_Tables_Experiment to HEAD (conflicts resovled)

Index: SHELL.R
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/SHELL.R,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** SHELL.R	26 Oct 2004 10:14:27 -0000	1.4
--- SHELL.R	1 Dec 2004 19:44:45 -0000	1.4.2.1
***************
*** 2086,2090 ****
--- 2086,2094 ----
  	'BigD',
  	'STAT',
+ #if	TARGET_API_MAC_CARBON
+ 	133,	/* normal window */
+ #else
  	128,
+ #endif
  	{100, 25, 175, 200},
  	2,

Index: kernvelverbs.r
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/kernvelverbs.r,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** kernvelverbs.r	20 Nov 2004 19:05:01 -0000	1.2.2.1
--- kernvelverbs.r	1 Dec 2004 19:44:45 -0000	1.2.2.2
***************
*** 885,888 ****
--- 885,889 ----
  		"hideapplication",
  		"isvalidserialnumber",
+ 		"showapplication",
  		"hashtablestats",
  		"testhashfunction"