Author: amaniatis
Date: Mon Jun 11 00:21:37 2012
New Revision: 1348693
URL: http://svn.apache.org/viewvc?rev=1348693&view=rev
Log:
Merge doc change from trunk
Modified:
cayenne/main/branches/STABLE-3.1/ (props changed)
cayenne/main/branches/STABLE-3.1/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt
Propchange: cayenne/main/branches/STABLE-3.1/
------------------------------------------------------------------------------
Merged /cayenne/main/trunk:r1348692
Modified:
cayenne/main/branches/STABLE-3.1/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt?rev=1348693&r1=1348692&r2=1348693&view=diff
==============================================================================
---
cayenne/main/branches/STABLE-3.1/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt
(original)
+++
cayenne/main/branches/STABLE-3.1/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt
Mon Jun 11 00:21:37 2012
@@ -27,7 +27,7 @@ GUI TOOLS
(http://www.jgoodies.com/)
5. CayenneModeler includes OGNL library developed by Drew Davidson and Luke
Blanshard
-(http://www.ognl.org/)
+(http://commons.apache.org/ognl/)
6. CayenneModeler includes GIF binary images developed by Eclipse Foundation.
(http://www.eclipse.org/).