Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 0 insertions, 63 deletions

diff --git a/source4/lib/appweb/ejs-2.0/ejs/system/README.TXT b/source4/lib/appweb/ejs-2.0/ejs/system/README.TXT
deleted file mode 100644
index a24e0e299c..0000000000
--- a/source4/lib/appweb/ejs-2.0/ejs/system/README.TXT
+++ /dev/null
@@ -1,63 +0,0 @@
-Embedded JavaScript System Model
-
-
-- Need args, arg types and exceptions thrown
-- Error classes
-
-class Global
-	class System
-		class environment
-			var 
-		class GC 
-			void function run()
-			function tune()
-			function getUsedMemory()			// Should be properties
-			function getAllocatedMemory()		// Should be properties
-
-		var javascript
-		var null
-		var undefined
-		var true
-		var false
-		var Nan
-		var Infinity
-
-		function random								// Not implemented
-		function sleep								// Not implemented
-		function exit
-		function yield								// Not implemented
-
-		Debug
-			isDebugMode
-
-		Limits
-			isLimitsMode					// Not implemented
-			stack							// Not implemented
-			heap							// Not implemented
-			flash							// Not implemented
-
-		Memory
-			getUsedMemory()					// Should be properties
-			getAvailableMemory()			// Should be properties
-			used
-			flash							// Not implemented
-
-	assert()
-	breakpoint()
-	dirname()
-	basename()
-	eval()
-	exit()
-	print()
-	println()
-	printVars()
-	sleep()
-	sort()
-	time()
-	typeof()
-	include()
-	trace()
-	printf()								// Not implemented
-	sprintf()
-
-