At file:///home/jelmer/bzr.samba/4.0-debian/

------------------------------------------------------------
revno: 11333
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 22:09:54 +0100
message:
  Merge upstream
modified:
  .bzrignore                     svn-v2:[EMAIL PROTECTED]
    ------------------------------------------------------------
    revno: 11321.1.414
    merged: svn-v2:[EMAIL PROTECTED]
    parent: svn-v2:[EMAIL PROTECTED]
    parent: [EMAIL PROTECTED]
    committer: jelmer
    timestamp: Tue 2007-03-13 21:00:27 +0000
    message:
      Ignore some more autogenerated files.
    ------------------------------------------------------------
    revno: 11321.1.413.1.1
    merged: [EMAIL PROTECTED]
    parent: svn-v2:[EMAIL PROTECTED]
    committer: Jelmer Vernooij <[EMAIL PROTECTED]>
    branch nick: SAMBA_4_0
    timestamp: Tue 2007-03-13 21:59:11 +0100
    message:
      Ignore some more autogenerated files.
=== modified file '.bzrignore'
--- a/.bzrignore        2007-03-13 18:20:56 +0000
+++ b/.bzrignore        2007-03-13 21:09:54 +0000
@@ -55,9 +55,7 @@
 source/lib/charset/charset_proto.h
 source/lib/cmdline/credentials.h
 source/lib/ldb/samba/ldif_handlers.h
-source/lib/registry/reg_backend_rpc.h
 source/lib/registry/regf.h
-source/lib/registry/registry_proto.h
 source/lib/registry/tdr_regf.c
 source/lib/registry/tdr_regf.h
 source/lib/samba3/samba3_proto.h
@@ -196,3 +194,5 @@
 debian/*.substvars
 debian/*.debhelper
 debian/files
+source/tests
+source/torture/unix/proto.h

Reply via email to