[frontierkernel-commits] Frontier/Common/resources/Win32 kernvelverbs.rc,1.1.2.1,1.1.2.2

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

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

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

Index: kernvelverbs.rc
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/kernvelverbs.rc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** kernvelverbs.rc	20 Nov 2004 19:05:01 -0000	1.1.2.1
--- kernvelverbs.rc	1 Dec 2004 19:44:45 -0000	1.1.2.2
***************
*** 827,831 ****
  		"frontier\0",		//Function Processor Name
  		true,			//Window required
! 			15,			//Count of verbs
  			"getprogrampath\0",
  			"getfilepath\0",
--- 827,831 ----
  		"frontier\0",		//Function Processor Name
  		true,			//Window required
! 			16,			//Count of verbs
  			"getprogrampath\0",
  			"getfilepath\0",
***************
*** 841,844 ****
--- 841,845 ----
  			"hideapplication\0",
  			"isvalidserialnumber\0",
+ 			"showapplication\0",
  			"hashtablestats\0",
  			"testhashfunction\0"