f9b53c6b5c
Conflicts: lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php |
||
---|---|---|
.. | ||
AbstractFileDriver.php | ||
AnnotationDriver.php | ||
DatabaseDriver.php | ||
DoctrineAnnotations.php | ||
Driver.php | ||
DriverChain.php | ||
PHPDriver.php | ||
StaticPHPDriver.php | ||
XmlDriver.php | ||
YamlDriver.php |