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, 38 deletions

diff --git a/source4/pidl/lib/Parse/Pidl.pm b/source4/pidl/lib/Parse/Pidl.pm
deleted file mode 100644
index c2c9463d03..0000000000
--- a/source4/pidl/lib/Parse/Pidl.pm
+++ /dev/null
@@ -1,38 +0,0 @@
-###################################################
-# package to parse IDL files and generate code for
-# rpc functions in Samba
-# Copyright tridge@samba.org 2000-2003
-# Copyright jelmer@samba.org 2005
-# released under the GNU GPL
-
-package Parse::Pidl;
-
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(warning error fatal $VERSION);
-
-use strict;
-
-use vars qw ( $VERSION );
-
-$VERSION = '0.02';
-
-sub warning
-{
-	my ($l,$m) = @_;
-	print STDERR "$l->{FILE}:$l->{LINE}: warning: $m\n";
-}
-
-sub error
-{
-	my ($l,$m) = @_;
-	print STDERR "$l->{FILE}:$l->{LINE}: error: $m\n";
-}
-
-sub fatal($$) 
-{ 
-    my ($e,$s) = @_; 
-    die("$e->{FILE}:$e->{LINE}: $s\n"); 
-}
-
-1;