Author: jelmer
Date: 2007-08-04 18:06:33 +0000 (Sat, 04 Aug 2007)
New Revision: 24202

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24202

Log:
merge upstream
Modified:
   branches/4.0-regwrite/
   branches/4.0-regwrite/source/build/smb_build/summary.pm


Changeset:

Property changes on: branches/4.0-regwrite
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: Sun 2007-03-04 19:47:55.924000025 +0100
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
properties: 
        branch-nick: 4.0-regwrite
        rebase-of: [EMAIL PROTECTED]

   + timestamp: Sun 2007-03-04 19:49:03.551000118 +0100
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
properties: 
        branch-nick: 4.0-regwrite
        rebase-of: [EMAIL PROTECTED]

Name: bzr:ancestry:v3-trunk0
   - [EMAIL PROTECTED]
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20758
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20807
[EMAIL PROTECTED]
[EMAIL PROTECTED]
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20997
[EMAIL PROTECTED]
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21260
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21302
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21487
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21545
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21682

   + [EMAIL PROTECTED]
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20758
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20807
[EMAIL PROTECTED]
[EMAIL PROTECTED]
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20997
[EMAIL PROTECTED]
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21260
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21302
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21487
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21545
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21682
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21684

Name: bzr:revision-id:v3-trunk0
   - 11140 [EMAIL PROTECTED]
11142 [EMAIL PROTECTED]
11143 [EMAIL PROTECTED]
11144 [EMAIL PROTECTED]
11145 [EMAIL PROTECTED]
11146 [EMAIL PROTECTED]
11147 [EMAIL PROTECTED]
11148 [EMAIL PROTECTED]
11149 [EMAIL PROTECTED]
11150 [EMAIL PROTECTED]
11151 [EMAIL PROTECTED]
11152 [EMAIL PROTECTED]
11153 [EMAIL PROTECTED]
11154 [EMAIL PROTECTED]
11155 [EMAIL PROTECTED]
11156 [EMAIL PROTECTED]
11157 [EMAIL PROTECTED]
11158 [EMAIL PROTECTED]
11159 [EMAIL PROTECTED]
11160 [EMAIL PROTECTED]
11161 [EMAIL PROTECTED]
11162 [EMAIL PROTECTED]
11163 [EMAIL PROTECTED]
11164 [EMAIL PROTECTED]
11165 [EMAIL PROTECTED]
11166 [EMAIL PROTECTED]
11167 [EMAIL PROTECTED]
11168 [EMAIL PROTECTED]
11169 [EMAIL PROTECTED]
11170 [EMAIL PROTECTED]
11171 [EMAIL PROTECTED]
11172 [EMAIL PROTECTED]
11173 [EMAIL PROTECTED]
11174 [EMAIL PROTECTED]

   + 11140 [EMAIL PROTECTED]
11142 [EMAIL PROTECTED]
11143 [EMAIL PROTECTED]
11144 [EMAIL PROTECTED]
11145 [EMAIL PROTECTED]
11146 [EMAIL PROTECTED]
11147 [EMAIL PROTECTED]
11148 [EMAIL PROTECTED]
11149 [EMAIL PROTECTED]
11150 [EMAIL PROTECTED]
11151 [EMAIL PROTECTED]
11152 [EMAIL PROTECTED]
11153 [EMAIL PROTECTED]
11154 [EMAIL PROTECTED]
11155 [EMAIL PROTECTED]
11156 [EMAIL PROTECTED]
11157 [EMAIL PROTECTED]
11158 [EMAIL PROTECTED]
11159 [EMAIL PROTECTED]
11160 [EMAIL PROTECTED]
11161 [EMAIL PROTECTED]
11162 [EMAIL PROTECTED]
11163 [EMAIL PROTECTED]
11164 [EMAIL PROTECTED]
11165 [EMAIL PROTECTED]
11166 [EMAIL PROTECTED]
11167 [EMAIL PROTECTED]
11168 [EMAIL PROTECTED]
11169 [EMAIL PROTECTED]
11170 [EMAIL PROTECTED]
11171 [EMAIL PROTECTED]
11172 [EMAIL PROTECTED]
11173 [EMAIL PROTECTED]
11174 [EMAIL PROTECTED]
11175 [EMAIL PROTECTED]

Name: svk:merge
...skipped...

Modified: branches/4.0-regwrite/source/build/smb_build/summary.pm
===================================================================
--- branches/4.0-regwrite/source/build/smb_build/summary.pm     2007-08-04 
18:06:28 UTC (rev 24201)
+++ branches/4.0-regwrite/source/build/smb_build/summary.pm     2007-08-04 
18:06:33 UTC (rev 24202)
@@ -39,7 +39,6 @@
        my ($output,$config) = @_;
 
        print "Summary:\n\n";
-       showitem($output, "GTK+ frontends", ["gtk","gconf"]);
        showitem($output, "SSL in SWAT and LDAP", ["GNUTLS"]);
        showitem($output, "threads in smbd (see --with-pthread)", ["PTHREAD"]);
        showitem($output, "intelligent command line editing", ["READLINE"]);

Reply via email to