2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD

Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.

source/gameengine/PyDoc/KX_GameActuator.py

@@ -5,15 +5,22 @@ from SCA_IActuator import *
 class KX_GameActuator(SCA_IActuator):
 	"""
 	The game actuator loads a new .blend file, restarts the current .blend file or quits the game.
+	
+	Properties:
+	
+	@ivar file: the new .blend file to load
+	@type file: string.
 	"""
 	def getFile():
 		"""
+		DEPRECATED: use the file property
 		Returns the filename of the new .blend file to load.
 		
 		@rtype: string
 		"""
 	def setFile(filename):
 		"""
+		DEPRECATED: use the file property
 		Sets the new .blend file to load.
 		
 		@param filename: The file name this actuator will load.