Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							a1ff408c13 
							
						 
					 
					
						
						
							
							Merge.  
						
						
						
					 
					
						2009-10-29 21:47:27 -05:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							31dc5f335d 
							
						 
					 
					
						
						
							
							Updated GuessSDKVersion  
						
						
						
					 
					
						2009-10-30 14:34:34 +13:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							eb68e4c627 
							
						 
					 
					
						
						
							
							SourceMod MSVC project files updated, windows tested and loading, gamedata fix.  
						
						
						
					 
					
						2009-10-30 14:29:45 +13:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							9e69afbbd6 
							
						 
					 
					
						
						
							
							Inital SM fixes for l4d2 and linux makefile updates  
						
						
						
					 
					
						2009-10-30 13:26:13 +13:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							2dea76dfa1 
							
						 
					 
					
						
						
							
							Changed name in credits.  
						
						
						
					 
					
						2009-10-29 17:35:00 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							8a8bafb199 
							
						 
					 
					
						
						
							
							Use GetSourceEngineBuild() from MM:S 1.8 legacy API (bug 4083, r=ds).  
						
						
						
					 
					
						2009-10-29 01:33:57 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							5a21d8c24d 
							
						 
					 
					
						
						
							
							Let SourceMod use OnUnlinkConCommandBase from MM:S 1.8 legacy API (bug 4080, r=ds).  
						
						
						
					 
					
						2009-10-29 00:53:31 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							5111b4799c 
							
						 
					 
					
						
						
							
							Fix iloop race when using AddCommandListener and SourceMod unloads (bug 4077, r=pred).  
						
						
						
					 
					
						2009-10-29 00:06:12 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							528bbe0116 
							
						 
					 
					
						
						
							
							Build against MM:S 1.8 with core-legacy (bug 4076, r=ds).  
						
						
						
					 
					
						2009-10-28 23:30:52 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							3030ab8664 
							
						 
					 
					
						
						
							
							Fixed crash when activating command listeners on EP1 while inside a command callback (bug 4072, r=pred).  
						
						
						
					 
					
						2009-10-28 00:50:48 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							2698ff1a04 
							
						 
					 
					
						
						
							
							Added feature testing functionality (bug 4021, r=pred).  
						
						
						
					 
					
						2009-10-28 00:37:34 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							6b06733192 
							
						 
					 
					
						
						
							
							Added better random number generator (bug 3831, r=fyren).  
						
						
						
					 
					
						2009-10-26 23:59:59 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							359146f60b 
							
						 
					 
					
						
						
							
							Don't pass unconnected clients into OnClientCommand (bug 3732, r=fyren).  
						
						
						
					 
					
						2009-10-26 23:51:39 -07:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							0931c6a7e1 
							
						 
					 
					
						
						
							
							Fix OnConfigsExecuted() executing too early on EP1 with large config files (bug 3828, r=dvander).  
						
						
						
					 
					
						2009-10-26 23:44:57 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							0cae3ac5a1 
							
						 
					 
					
						
						
							
							Use case-insensitive game folder matches for Windows (bug 3913, r=pred).  
						
						
						
					 
					
						2009-09-27 02:19:17 -04:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							4fc378d3e2 
							
						 
					 
					
						
						
							
							Target filters now run for "@me" special target (bug 4000, r=pred).  
						
						
						
					 
					
						2009-09-27 02:17:23 -04:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							e3e11d233c 
							
						 
					 
					
						
						
							
							Merge.  
						
						
						
					 
					
						2009-10-06 13:37:59 -05:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							fcfd5c7419 
							
						 
					 
					
						
						
							
							Fixed crash when a plugin was unloaded before a client convar query had returned results (bug 4044, r=dvander).  
						
						
						
					 
					
						2009-10-06 13:37:30 -05:00 
						 
				 
			
				
					
						
							
							
								Erik Minekus 
							
						 
					 
					
						
						
						
						
							
						
						
							be8c498aea 
							
						 
					 
					
						
						
							
							Fix help message for sm cvars (bug 3994, r=dvander).  
						
						
						
					 
					
						2009-10-06 03:15:10 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							8a2c299653 
							
						 
					 
					
						
						
							
							Fixed rare crash involving hudtext code and maxclient shifts (bug 4016, r=fyren).  
						
						
						
					 
					
						2009-10-02 04:30:46 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							dc0d6a9b4a 
							
						 
					 
					
						
						
							
							Fixed crash when reloading blocked plugins fails (bug 4038, r+a=fyren).  
						
						
						
					 
					
						2009-10-02 03:33:59 -07:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							d43b027c25 
							
						 
					 
					
						
						
							
							Fixed crash when block-loading more than 8 plugins (bug 4034, r=dvander).  
						
						
						
					 
					
						2009-10-02 02:30:01 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							c72bfe3685 
							
						 
					 
					
						
						
							
							Another forgotten-file for bug 4015. Thanks mqueues.  
						
						
						
					 
					
						2009-09-26 17:19:47 -04:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							90137f2263 
							
						 
					 
					
						
						
							
							Follow-up to bug 4015: apparently hg patch doesn't commit added files.  
						
						
						
					 
					
						2009-09-26 17:14:50 -04:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							d8474cfafa 
							
						 
					 
					
						
						
							
							Added generic command hooking mechanism, to replace Reg*Cmd which is intended for command creation (bug 4015, r=pred).  
						
						
						
					 
					
						2009-09-26 17:12:23 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							dbcb3e6192 
							
						 
					 
					
						
						
							
							Merge  
						
						
						
					 
					
						2009-09-17 19:04:15 +12:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							acba87ae46 
							
						 
					 
					
						
						
							
							Added voting output (bug 1997, r=dvander)  
						
						
						
					 
					
						2009-09-17 18:54:40 +12:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							533f17b3b0 
							
						 
					 
					
						
						
							
							Block plugins from registering "sm" command (bug 4013, r=pred).  
						
						
						
					 
					
						2009-09-16 22:37:20 -07:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							77de71d79d 
							
						 
					 
					
						
						
							
							Fixed gnprintf's translation parameter reordering (bug 4010, r=dvander)  
						
						
						
					 
					
						2009-09-16 13:38:04 +12:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							caadb7fa27 
							
						 
					 
					
						
						
							
							Fixed invalid array access in PluginSys (bug 3933, r=pred).  
						
						
						
					 
					
						2009-09-07 21:29:18 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							852eb5c524 
							
						 
					 
					
						
						
							
							Fixed BanClient() crashing if called before certain callbacks (bug 3912, r=pred).  
						
						
						
					 
					
						2009-09-07 16:21:48 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							db97c2a5b1 
							
						 
					 
					
						
						
							
							Thanks, Python.  
						
						
						
					 
					
						2009-08-30 17:27:44 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							70993256b9 
							
						 
					 
					
						
						
							
							Added -lpthread to sourcemod.logic binary.  
						
						
						
					 
					
						2009-08-30 17:26:03 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							7ffcc176cd 
							
						 
					 
					
						
						
							
							Fixed build failure in profiler.  
						
						
						
					 
					
						2009-08-30 01:43:05 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							d682361cfc 
							
						 
					 
					
						
						
							
							More changes for new build system.  
						
						
						
					 
					
						2009-08-30 00:46:56 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							d3f0a14867 
							
						 
					 
					
						
						
							
							Imported support for new build system.  
						
						
						
					 
					
						2009-08-30 00:21:42 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							83393f299a 
							
						 
					 
					
						
						
							
							Removed auto folders (bug 3949).  
						
						
						
					 
					
						2009-08-30 00:03:58 -07:00 
						 
				 
			
				
					
						
							
							
								Kornelijus Survila 
							
						 
					 
					
						
						
						
						
							
						
						
							d6cf9bd8ae 
							
						 
					 
					
						
						
							
							Added manual extension reloading command to root console menu (bug 3934, r=dvander)  
						
						
						
					 
					
						2009-08-24 09:11:42 +12:00 
						 
				 
			
				
					
						
							
							
								Zach Kanzler 
							
						 
					 
					
						
						
						
						
							
						
						
							5710a35388 
							
						 
					 
					
						
						
							
							Added Kick, Ban and IsInKickQueue to public extension API (bug 3907, r=dvander)  
						
						
						
					 
					
						2009-08-24 09:05:54 +12:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							886b683739 
							
						 
					 
					
						
						
							
							Makefile fix  
						
						
						
					 
					
						2009-08-17 10:54:57 +12:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							95cffca5f1 
							
						 
					 
					
						
						
							
							Forgot makefiles patch  
						
						
						
					 
					
						2009-08-17 10:53:54 +12:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							13b9deb5ef 
							
						 
					 
					
						
						
							
							Merged the build fixes (hopefully)  
						
						
						
					 
					
						2009-08-17 10:42:01 +12:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							c307c692a0 
							
						 
					 
					
						
						
							
							Copy of new tf engine changes from 1.2 branch  
						
						
						
					 
					
						2009-08-17 10:03:53 +12:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							b5152c0c48 
							
						 
					 
					
						
						
							
							Fix sm_corecfgfile for modified sm_basepaths (bug 3856, r=dvander)  
						
						
						
					 
					
						2009-07-27 13:22:55 -07:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							0c9160ec8b 
							
						 
					 
					
						
						
							
							More build fix attempts  
						
						
						
					 
					
						2009-07-24 12:54:08 +12:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							3e36382b58 
							
						 
					 
					
						
						
							
							Added support for logical (non-networked) entities using entity references - See  http://wiki.alliedmods.net/Entity_References_%28SourceMod%29  (bug 2459, r=dvander)  
						
						
						
					 
					
						2009-07-24 12:34:31 +12:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							d4798ccaa5 
							
						 
					 
					
						
						
							
							Fixed revote bug and inflexibilities in RedrawClientVoteMenu (bug 3834, r=fyren).  
						
						
						
					 
					
						2009-05-30 19:59:55 -04:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							c2c4ed1fe5 
							
						 
					 
					
						
						
							
							Fix crash when unloading a plugin with live user message hooks (bug 3817, r=dvander)  
						
						
						
					 
					
						2009-05-25 18:12:26 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							53e98c114a 
							
						 
					 
					
						
						
							
							Fixed Plugin_Handled acting like a Stop in usermsg hooks (bug 3685, r=fyren).  
						
						
						
					 
					
						2009-05-24 12:01:18 -04:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							7605396e84 
							
						 
					 
					
						
						
							
							Add L4D handling to GuessSDKVersion() (bug 3842, r=dvander)  
						
						
						
					 
					
						2009-05-16 16:32:21 -07:00 
						 
				 
			
				
					
						
							
							
								"David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							cec339552e 
							
						 
					 
					
						
						
							
							Moved smn_functions to logic binary.  
						
						... 
						
						
						
						--HG--
rename : core/smn_functions.cpp => core/logic/smn_functions.cpp 
						
					 
					
						2009-05-14 11:38:50 -04:00 
						 
				 
			
				
					
						
							
							
								"David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							fc003db139 
							
						 
					 
					
						
						
							
							Updated MSVC9 files.  
						
						
						
					 
					
						2009-05-14 11:28:43 -04:00 
						 
				 
			
				
					
						
							
							
								"David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							caf434aef2 
							
						 
					 
					
						
						
							
							Moved profiler and adt_trie to logic binary.  
						
						... 
						
						
						
						--HG--
rename : core/Profiler.cpp => core/logic/Profiler.cpp
rename : core/Profiler.h => core/logic/Profiler.h
rename : core/smn_adt_trie.cpp => core/logic/smn_adt_trie.cpp 
						
					 
					
						2009-05-14 11:24:07 -04:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							5261873f39 
							
						 
					 
					
						
						
							
							Fixed Linux build.  
						
						
						
					 
					
						2009-05-13 22:07:11 -04:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							421b58f68e 
							
						 
					 
					
						
						
							
							Import of core modularization plan (bug 3599).  
						
						
						
					 
					
						2009-05-13 21:55:50 -04:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							2af45da0a8 
							
						 
					 
					
						
						
							
							Merge from 1.2 branch.  
						
						
						
					 
					
						2009-05-12 19:43:21 -04:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							6a24b049cb 
							
						 
					 
					
						
						
							
							Fixed early tv_enable causing crashes (bug 3766, r=dvander).  
						
						
						
					 
					
						2009-05-12 17:27:45 -04:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							1112dfffb3 
							
						 
					 
					
						
						
							
							Merge.  
						
						
						
					 
					
						2009-05-12 17:26:47 -04:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							3304bc2f3a 
							
						 
					 
					
						
						
							
							Backed out changeset 97d5f4dbae0b  
						
						
						
					 
					
						2009-05-12 17:26:39 -04:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							2d4fb8a463 
							
						 
					 
					
						
						
							
							Merge.  
						
						
						
					 
					
						2009-05-12 12:37:24 -04:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							56c5012bef 
							
						 
					 
					
						
						
							
							Fixed early tv_enable causing crashes (bug 3766, r=dvander).  
						
						
						
					 
					
						2009-05-12 12:37:12 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							7710a1fdb0 
							
						 
					 
					
						
						
							
							Merge from 1.2 branch  
						
						
						
					 
					
						2009-05-11 11:45:08 +12:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							bd97bdd378 
							
						 
					 
					
						
						
							
							Fixed unhook event crash (bug 3814, r=dvander)  
						
						
						
					 
					
						2009-05-11 11:32:59 +12:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							f74380b3e9 
							
						 
					 
					
						
						
							
							Fix casting problems in TextParsers breaking TrimString for non-ASCII (bug 3800, r+a12=dvander)  
						
						
						
					 
					
						2009-05-03 11:23:12 -07:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							4abdc29d9e 
							
						 
					 
					
						
						
							
							l2merge Fyren  
						
						
						
					 
					
						2009-04-24 18:20:55 +12:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							74a25097b2 
							
						 
					 
					
						
						
							
							Fix OnClientConnect rejectmsg handling, improve doc (bug 3690, r=dvander)  
						
						
						
					 
					
						2009-04-13 16:39:53 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							40a8892cb7 
							
						 
					 
					
						
						
							
							Merge from sourcemod-1.2 branch.  
						
						
						
					 
					
						2009-03-30 11:43:16 +02:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							16756e550f 
							
						 
					 
					
						
						
							
							Handle FormatMessage failures from LoadLibrary oddities (bug 3760, r=fyren).  
						
						
						
					 
					
						2009-03-29 09:01:40 -04:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							933b77e429 
							
						 
					 
					
						
						
							
							Fix sm exts info help message  
						
						
						
					 
					
						2009-03-25 21:01:40 -07:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							3ac9ecb4b7 
							
						 
					 
					
						
						
							
							Removed tag system (bug 3751, r=fyren, a12=blocking).  
						
						
						
					 
					
						2009-03-25 03:27:32 -04:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							d7917a6a9a 
							
						 
					 
					
						
						
							
							Add AskPluginLoad2() to allow silent failure, deprecate AskPluginLoad() (bug 3716, r=dvander)  
						
						
						
					 
					
						2009-03-18 19:20:40 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							d8264fada7 
							
						 
					 
					
						
						
							
							Merge from 1.2 branch.  
						
						
						
					 
					
						2009-03-05 15:48:38 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							72da49415e 
							
						 
					 
					
						
						
							
							Added -dev tag back to version.h files for manual builds.  
						
						
						
					 
					
						2009-03-05 14:59:09 -06:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							8e744ec5f7 
							
						 
					 
					
						
						
							
							Re-added -dev tag, bumped version to 1.2.1.  
						
						
						
					 
					
						2009-03-05 02:36:27 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							8dfbcf5a9f 
							
						 
					 
					
						
						
							
							Bumped versions.  
						
						
						
					 
					
						2009-03-05 02:07:44 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							1f636bf7a9 
							
						 
					 
					
						
						
							
							Bumped trunk to 1.3.0.  
						
						
						
					 
					
						2009-03-05 01:48:18 -05:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							096a04b3e4 
							
						 
					 
					
						
						
							
							Added SourceMod to the sv_tags list and added a tags API for plugins (bug 3688, r=dvander)  
						
						
						
					 
					
						2009-03-05 11:59:49 +13:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							e6ea726b69 
							
						 
					 
					
						
						
							
							Improved docs of TIMER_HNDL_CLOSE (bug 3641, r=dvander).  
						
						
						
					 
					
						2009-03-01 16:48:55 -05:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							98c1a18e57 
							
						 
					 
					
						
						
							
							Improved error message for handle leakage (bug 3646, r,a12=dvander).  
						
						
						
					 
					
						2009-03-01 16:43:48 -05:00 
						 
				 
			
				
					
						
							
							
								Fyren 
							
						 
					 
					
						
						
						
						
							
						
						
							e04d2a4a10 
							
						 
					 
					
						
						
							
							Added case insensitivity search to ReplaceString (bug 3639, r=dvander).  
						
						
						
					 
					
						2009-03-01 16:41:44 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							96a3671bb6 
							
						 
					 
					
						
						
							
							Improved user message interception API (bug 3631, r=pred).  
						
						
						
					 
					
						2009-03-01 16:39:25 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							6ebbb48f9f 
							
						 
					 
					
						
						
							
							Re-landed automating updating (bug 3530, r=pred).  
						
						
						
					 
					
						2009-03-01 01:35:39 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							eb25650e26 
							
						 
					 
					
						
						
							
							Merge.  
						
						
						
					 
					
						2009-02-28 23:15:23 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							c4cba5254c 
							
						 
					 
					
						
						
							
							Added auto-restart functionality to the Updater extensions (bug 3530, r=pred).  
						
						
						
					 
					
						2009-02-28 23:14:16 -05:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							2c3bf7dd23 
							
						 
					 
					
						
						
							
							Ran versionchanger script for consistency.  
						
						
						
					 
					
						2009-02-25 23:44:18 -06:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							7dcc7ea99c 
							
						 
					 
					
						
						
							
							And again with the linux fixing (bug 3657)  
						
						
						
					 
					
						2009-02-23 08:58:14 +13:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							4590015ed6 
							
						 
					 
					
						
						
							
							Fixed linux build  
						
						
						
					 
					
						2009-02-22 14:58:05 +13:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							79f9dc61a4 
							
						 
					 
					
						
						
							
							Added edict_t and CBaseHandle conversion functions to IGameHelpers (bug 2616, r=dvander)  
						
						
						
					 
					
						2009-02-22 14:38:05 +13:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							792204bd06 
							
						 
					 
					
						
						
							
							This has to be the worst GCC error ever.  
						
						
						
					 
					
						2009-02-19 19:35:45 +13:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							ca3df3bd50 
							
						 
					 
					
						
						
							
							Added a client verification serial API (bug 3616, r=dvander)  
						
						
						
					 
					
						2009-02-19 19:19:44 +13:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							44a04e6167 
							
						 
					 
					
						
						
							
							DS fails once again. Fixed Linux build once and for all.  
						
						
						
					 
					
						2009-02-18 03:25:01 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							9d6a9eb615 
							
						 
					 
					
						
						
							
							Ugh, fixed Linux build for real by removing stray underscores.  
						
						
						
					 
					
						2009-02-18 03:13:25 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							32d2d4107d 
							
						 
					 
					
						
						
							
							Fixed Linux build.  
						
						
						
					 
					
						2009-02-18 02:58:03 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							75ebac822d 
							
						 
					 
					
						
						
							
							Merge.  
						
						
						
					 
					
						2009-02-18 02:30:21 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							bd9fab6cf5 
							
						 
					 
					
						
						
							
							Added support for Dark Messiah engine and game. (no bug, r=me).  
						
						... 
						
						
						
						The development of this feature would not be possible without the support of the following people from the game's community:
Dylan Riggs, Carl Pettengill, Ed Moreland, and Christian. 
						
					 
					
						2009-02-18 02:19:22 -06:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							d75f8f11e1 
							
						 
					 
					
						
						
							
							Oops - FormatPath missing a param (bug 3645)  
						
						
						
					 
					
						2009-02-18 19:59:14 +13:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							b61542242c 
							
						 
					 
					
						
						
							
							Build Fix!  
						
						
						
					 
					
						2009-02-18 15:30:43 +13:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							13c1fd09c4 
							
						 
					 
					
						
						
							
							Added custom gamedata file parsing (bug 3644, r=dvander)  
						
						
						
					 
					
						2009-02-18 15:08:17 +13:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							fddb69e49e 
							
						 
					 
					
						
						
							
							Fixed MsgSentNotify callbacks not firing on intercept hook (bug3631, r=dvander)  
						
						
						
					 
					
						2009-02-18 15:03:17 +13:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							9e445a5adf 
							
						 
					 
					
						
						
							
							Added API to grab arbitrary kv pairs from core.cfg.  
						
						
						
					 
					
						2009-02-17 16:19:11 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							97e25c37de 
							
						 
					 
					
						
						
							
							Deprecated Acquire/ReleaseLock from IGameConfigManager, use thread pump in updater.  
						
						
						
					 
					
						2009-02-17 15:59:51 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							16033c1307 
							
						 
					 
					
						
						
							
							Deprecated sm_corecfgfile for sm_basepath (bug 2693, r=ds).  
						
						
						
					 
					
						2009-02-17 14:03:20 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							e276223b61 
							
						 
					 
					
						
						
							
							Merge from sourcemod-1.1.  
						
						
						
					 
					
						2009-02-08 00:02:58 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							a3fade1c1d 
							
						 
					 
					
						
						
							
							Fixed EventManager holding onto stale pointers (bug 3548, r=ds).  
						
						
						
					 
					
						2009-02-07 23:56:48 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							ffd8ff099a 
							
						 
					 
					
						
						
							
							Initial import of updater extension, currently incomplete - just getting it in the tree (bug 3530).  
						
						
						
					 
					
						2009-02-02 15:41:25 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							cef6a2e389 
							
						 
					 
					
						
						
							
							Added an SMC stream reader to ITextParser (bug 3530, r=pred).  
						
						
						
					 
					
						2009-02-01 20:31:27 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							2b97461f54 
							
						 
					 
					
						
						
							
							Added snprintf/vsnprintf helpers to ISourceMod, finally (bug 3530, r=pred).  
						
						
						
					 
					
						2009-02-01 19:57:09 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							7b6dcfce87 
							
						 
					 
					
						
						
							
							Removed md5 files from core, as they are unused.  
						
						
						
					 
					
						2009-02-01 17:50:44 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							d69d97402b 
							
						 
					 
					
						
						
							
							Fixed nits from bug 3570.  
						
						
						
					 
					
						2009-02-01 02:35:19 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							643c39690f 
							
						 
					 
					
						
						
							
							Added client "sm", "sm credits", and "sm plugins" commands (bug 3570, r=ds,pred).  
						
						
						
					 
					
						2009-02-01 02:33:31 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							6048144310 
							
						 
					 
					
						
						
							
							RegConsoleCmd is now case insensitive for client-only commands (bug 3602, r=ds).  
						
						
						
					 
					
						2009-02-01 02:13:17 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							a017e4820a 
							
						 
					 
					
						
						
							
							Added the ability for extensions to invoke arbitrary natives (bug 3605, r=ds,theY4Kman).  
						
						
						
					 
					
						2009-02-01 02:03:03 -05:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							f4a5457941 
							
						 
					 
					
						
						
							
							Merged changes from sourcemod-1.1 branch.  
						
						
						
					 
					
						2009-01-28 00:00:19 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							7167a807bf 
							
						 
					 
					
						
						
							
							Fixed a crash in the Event Manager when a game fired an event from a listener that was looking for the same event (bug 3468, r=me).  
						
						... 
						
						
						
						In other words it was a problem where our FireEvent hooks were being re-entered for the _same_ game event. The Event Manager was not able to handle this and crashed. 
						
					 
					
						2009-01-27 23:53:48 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							157f050f89 
							
						 
					 
					
						
						
							
							Fixed a memory leak when game events were hooked as EventHookMode_Post (no bug, r=me).  
						
						... 
						
						
						
						The duplicated event data that was being carried over to the IGameEventManager2::FireEvent post hook was not being freed. EventHookMode_Post is the default so this leak could have happened fairly often. 
						
					 
					
						2009-01-27 13:41:57 -06:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							e31cbbfe21 
							
						 
					 
					
						
						
							
							New gamedata organization (bug 3546, r=ds,pred).  
						
						
						
					 
					
						2009-01-12 02:28:22 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							ccc59ecdaf 
							
						 
					 
					
						
						
							
							Pre-emptive removal of gamedata updater pending rewrite.  
						
						
						
					 
					
						2009-01-08 16:11:59 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							d2ce50f989 
							
						 
					 
					
						
						
							
							Merge from sourcemod-1.1 branch.  
						
						
						
					 
					
						2009-01-08 13:39:16 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							c676ecc026 
							
						 
					 
					
						
						
							
							Fixed regression in printing floats with no precision (bug 3447, r=ds).  
						
						
						
					 
					
						2009-01-07 19:23:24 -05:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							4b1deee7e1 
							
						 
					 
					
						
						
							
							El merge.  
						
						
						
					 
					
						2008-12-29 00:12:37 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							bf5fefe84f 
							
						 
					 
					
						
						
							
							Merge from sourcemod-1.1 branch.  
						
						
						
					 
					
						2008-12-29 00:11:32 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							5c92b0d154 
							
						 
					 
					
						
						
							
							Bumped version to 1.1.1 and added back -dev build string.  
						
						
						
					 
					
						2008-12-28 23:50:26 -06:00 
						 
				 
			
				
					
						
							
							
								Liam 
							
						 
					 
					
						
						
						
						
							
						
						
							004d450844 
							
						 
					 
					
						
						
							
							Removed the if (ident==NULL) from BindAdminCache  
						
						
						
					 
					
						2008-12-29 00:31:16 -05:00 
						 
				 
			
				
					
						
							
							
								Liam 
							
						 
					 
					
						
						
						
						
							
						
						
							7705e88b57 
							
						 
					 
					
						
						
							
							Prevented blank/empty admins from being created. (Bug 3431 r=dvander)  
						
						
						
					 
					
						2008-12-28 23:45:18 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							3f250ba42d 
							
						 
					 
					
						
						
							
							Bumped version files.  
						
						
						
					 
					
						2008-12-28 20:35:51 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							1577fab93a 
							
						 
					 
					
						
						
							
							Ran versionchanger.pl over trunk to get 1.2.0 into headers (bug 3521).  
						
						
						
					 
					
						2008-12-28 19:59:40 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							181fe74b09 
							
						 
					 
					
						
						
							
							Merge from sourcemod-1.1 branch.  
						
						
						
					 
					
						2008-12-28 19:56:40 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							701fef1ba4 
							
						 
					 
					
						
						
							
							Log file name consistency for gamedata logs (no bug).  
						
						
						
					 
					
						2008-12-28 18:54:36 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							0a33a25a7d 
							
						 
					 
					
						
						
							
							Merge from sourcemod-1.1 branch.  
						
						
						
					 
					
						2008-12-28 03:23:45 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							08e2fc8deb 
							
						 
					 
					
						
						
							
							Support for 3-letter language codes (bug 3526, r=ds).  
						
						
						
					 
					
						2008-12-28 02:38:53 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							ebed45a0f6 
							
						 
					 
					
						
						
							
							Fixed Linux build.  
						
						
						
					 
					
						2008-12-28 01:10:20 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							d3c279fd05 
							
						 
					 
					
						
						
							
							Fixed threading issues in gamedata fetcher, new restart mechanism (bug 3351, r=pred).  
						
						
						
					 
					
						2008-12-28 01:02:05 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							e69ed4b0da 
							
						 
					 
					
						
						
							
							Removed unsafe calls from gamedata threader (bug 3351, r=pred).  
						
						
						
					 
					
						2008-12-27 19:50:13 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							4daca3c5ba 
							
						 
					 
					
						
						
							
							Another gamedata cleanup sponsored by an r=pred (bug 3351).  
						
						
						
					 
					
						2008-12-26 23:26:21 -05:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							1fe38c7473 
							
						 
					 
					
						
						
							
							SourceMod can now be somewhat compiled on OS X for patch sanity testing (bug 3516, r=ds).  
						
						... 
						
						
						
						This adds the ability for us to change the GCC version we use more flexibly. 
						
					 
					
						2008-12-23 01:33:37 -05:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							a1b91ac136 
							
						 
					 
					
						
						
							
							Merge from 1.1 branch.  
						
						
						
					 
					
						2008-12-07 20:52:06 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							4bbd74b702 
							
						 
					 
					
						
						
							
							Shell script code in Makefiles is now POSIX compliant and is able to be run on dash.  
						
						
						
					 
					
						2008-12-07 20:40:31 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							7bdcea5814 
							
						 
					 
					
						
						
							
							Merged changes from 1.1 branch.  
						
						
						
					 
					
						2008-12-05 15:57:49 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							d51aaec97d 
							
						 
					 
					
						
						
							
							Fixed a memory leak that occurred when a ConCmdIter handle was closed. (L4D engine)  
						
						... 
						
						
						
						Note: These handles are used by the FindFirstConCommand and FindNextConCommand natives. 
						
					 
					
						2008-12-02 10:57:42 -06:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							7ff0129f36 
							
						 
					 
					
						
						
							
							Fixed ReadFileString ignoring fourth parameter (bug 3459, r=ds).  
						
						
						
					 
					
						2008-11-29 22:43:30 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							fef83838f9 
							
						 
					 
					
						
						
							
							Merged another change from 1.1 branch.  
						
						
						
					 
					
						2008-11-28 23:34:18 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							1422a9abe3 
							
						 
					 
					
						
						
							
							Merged changes from 1.1 branch.  
						
						
						
					 
					
						2008-11-28 23:32:59 -06:00 
						 
				 
			
				
					
						
							
							
								David Anderson 
							
						 
					 
					
						
						
						
						
							
						
						
							2fc0520895 
							
						 
					 
					
						
						
							
							Fixed ReadFile sign-extending instead of zero-extending (bug 3449, r=ds).  
						
						
						
					 
					
						2008-11-28 20:01:23 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							ecaced40f2 
							
						 
					 
					
						
						
							
							Now compiles against Metamod:Source 1.7 (bug 3445).  
						
						
						
					 
					
						2008-11-27 01:13:51 -06:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							984a2d26f4 
							
						 
					 
					
						
						
							
							Merge!  
						
						
						
					 
					
						2008-11-25 19:14:02 +13:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							f85bb7e490 
							
						 
					 
					
						
						
							
							SourceMod now handles steamid's internally without the STEAM_*: part (bug 3428)  
						
						
						
					 
					
						2008-11-25 19:13:08 +13:00 
						 
				 
			
				
					
						
							
							
								Matt Woodrow 
							
						 
					 
					
						
						
						
						
							
						
						
							321443450a 
							
						 
					 
					
						
						
							
							SourceMod now handles steamid's internally without the STEAM_*: part (bug 3428)  
						
						
						
					 
					
						2008-11-25 19:10:52 +13:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							25a0a192a2 
							
						 
					 
					
						
						
							
							Added /MP back to core and sdktools MSVC project files.  
						
						
						
					 
					
						2008-11-24 09:41:46 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							843ff25de4 
							
						 
					 
					
						
						
							
							Moved SE_* constants from PrePreprocessorDefinitions to AdditionalOptions in MSVC project files.  
						
						... 
						
						
						
						-Doing this should make it a bit easier to maintain in the future.
Also added back /MP to core and sdktools. 
						
					 
					
						2008-11-24 09:33:11 -06:00 
						 
				 
			
				
					
						
							
							
								Scott Ehlert 
							
						 
					 
					
						
						
						
						
							
						
						
							4563c00deb 
							
						 
					 
					
						
						
							
							Merge.  
						
						
						
					 
					
						2008-11-24 08:39:46 -06:00