Merge remote branch 'upstream/master'

Conflicts:
	Jamroot
	bjam
	decoder/Jamfile
	decoder/cdec.cc
	dpmert/Jamfile
	jam-files/sanity.jam
	klm/lm/Jamfile
	klm/util/Jamfile
	mira/Jamfile

1 files changed, 0 insertions, 32 deletions

diff --git a/jam-files/engine/modules/path.c b/jam-files/engine/modules/path.c
deleted file mode 100644
index f5d09622..00000000
--- a/jam-files/engine/modules/path.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright Vladimir Prus 2003. Distributed under the Boost */
-/* Software License, Version 1.0. (See accompanying */
-/* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */
-
-#include "../native.h"
-#include "../timestamp.h"
-#include "../newstr.h"
-
-LIST *path_exists( PARSE *parse, FRAME *frame )
-{
-    LIST* l = lol_get( frame->args, 0 );    
-
-    time_t time;
-    timestamp(l->string, &time);
-    if (time != 0)
-    {
-        return list_new(0, newstr("true"));
-    }
-    else
-    {
-        return L0;
-    }
-}
-
-void init_path()
-{
-    {
-        char* args[] = { "location", 0 };
-        declare_native_rule("path", "exists", args, path_exists, 1);
-    }
-
-}