Christian Heinrich 3fc9971e98 Merge commit 'upstream/master' ... Conflicts: lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php		2010-05-20 14:17:39 +02:00
..
Driver	Merge commit 'upstream/master'	2010-05-20 14:17:39 +02:00
AssociationMapping.php	[DDC-561] Fixed.	2010-04-30 17:30:27 +02:00
ClassMetadata.php	[DDC-552] Fixing issue with getReflectionClass() not existing on ClassMetadataInfo when it is required by AnnotationDriver	2010-04-30 12:27:52 -04:00
ClassMetadataFactory.php	[DDC-481] Fixed.	2010-05-08 17:01:20 +02:00
ClassMetadataInfo.php	[DDC-481] Fixed.	2010-05-08 17:01:20 +02:00
ManyToManyMapping.php	[DDC-497][DDC-500][DDC-342] Fixed. Persister polishing and refactoring. More to come for that, but after beta1.	2010-04-26 13:02:30 +02:00
MappingException.php	[DDC-497][DDC-500][DDC-342] Fixed. Persister polishing and refactoring. More to come for that, but after beta1.	2010-04-26 13:02:30 +02:00
OneToManyMapping.php	[DDC-497][DDC-500][DDC-342] Fixed. Persister polishing and refactoring. More to come for that, but after beta1.	2010-04-26 13:02:30 +02:00
OneToOneMapping.php	[DDC-497][DDC-500][DDC-342] Fixed. Persister polishing and refactoring. More to come for that, but after beta1.	2010-04-26 13:02:30 +02:00