Alexander f47e1feac6 Merge branch 'master' of git://github.com/doctrine/doctrine2 into ProxyIdentifer ... Conflicts: lib/Doctrine/ORM/Proxy/ProxyFactory.php		2011-10-15 17:24:13 +02:00
..
Proxy.php	[2.0][DDC-237][DDC-216] Fixed. If you're using manual proxy generation through the CLI, please regenerate your proxies.	2010-01-05 11:45:38 +00:00
ProxyException.php	[2.0] DDC-484 - Fix reference to Doctrine\ORM\ORMException in ProxyException, added two unit-tests for missing tests of ProxyException throws	2010-04-02 15:05:53 +00:00
ProxyFactory.php	Merge branch 'master' of git://github.com/doctrine/doctrine2 into ProxyIdentifer	2011-10-15 17:24:13 +02:00