From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <rhug-cvs-return-349-listarch-rhug-cvs=sources.redhat.com@sources.redhat.com>
Received: (qmail 21053 invoked by alias); 26 Mar 2003 15:06:01 -0000
Mailing-List: contact rhug-cvs-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:rhug-cvs-subscribe@sources.redhat.com>
List-Post: <mailto:rhug-cvs@sources.redhat.com>
List-Help: <mailto:rhug-cvs-help@sources.redhat.com>, <http://sources.redhat.com/lists.html#faqs>
Sender: rhug-cvs-owner@sources.redhat.com
Received: (qmail 21043 invoked by uid 9364); 26 Mar 2003 15:06:01 -0000
Date: Wed, 26 Mar 2003 15:06:00 -0000
Message-ID: <20030326150601.21041.qmail@sources.redhat.com>
From: gary@sources.redhat.com
To: rhug-cvs@sources.redhat.com
Subject: rhug/commons-beanutils/upstream/src/java/org/a ...
X-SW-Source: 2003/txt/msg00056.txt.bz2
List-Id: <rhug-cvs.sourceware.org>

CVSROOT:	/cvs/rhug
Module name:	rhug
Changes by:	gary@sourceware.org	2003-03-26 15:06:01

Modified files:
	commons-beanutils/upstream/src/java/org/apache/commons/beanutils: 
	                                                                  MappedPropertyDescriptor.java 

Log message:
	Resolve conflict (???)

Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/rhug/commons-beanutils/upstream/src/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java.diff?cvsroot=rhug&r1=1.2&r2=1.3