Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 15544 invoked from network); 11 Apr 2010 17:19:11 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Apr 2010 17:19:11 -0000 Received: (qmail 74924 invoked by uid 500); 11 Apr 2010 17:19:11 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 74885 invoked by uid 500); 11 Apr 2010 17:19:11 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 74878 invoked by uid 99); 11 Apr 2010 17:19:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Apr 2010 17:19:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Apr 2010 17:19:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A067E2388978; Sun, 11 Apr 2010 17:18:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn propchange: r932890 - svn:log Date: Sun, 11 Apr 2010 17:18:47 -0000 To: commits@subversion.apache.org From: gstein@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100411171847.A067E2388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gstein Revision: 932890 Modified property: svn:log Modified: svn:log at Sun Apr 11 17:18:47 2010 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Sun Apr 11 17:18:47 2010 @@ -20,9 +20,9 @@ Suggested by: gstein svn_wc__db_conflict_skel_set_op_switch, svn_wc__db_conflict_skel_set_op_merge, svn_wc__db_conflict_skel_set_op_patch, - svn_wc__db_conflict_skel_set_add_text_conflict, - svn_wc__db_conflict_skel_set_add_prop_conflict, - svn_wc__db_conflict_skel_set_add_tree_conflict, - svn_wc__db_conflict_skel_set_add_reject_conflict, - svn_wc__db_conflict_skel_set_add_obstruction): ... these declarations. + svn_wc__db_conflict_skel_add_text_conflict, + svn_wc__db_conflict_skel_add_prop_conflict, + svn_wc__db_conflict_skel_add_tree_conflict, + svn_wc__db_conflict_skel_add_reject_conflict, + svn_wc__db_conflict_skel_add_obstruction): ... these declarations. (svn_wc__db_conflict_skel_new): Declare.