Author: ajaquith
Date: Tue Aug 12 08:48:04 2008
New Revision: 685202
URL: http://svn.apache.org/viewvc?rev=685202&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 685086.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.project
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.project
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.project?rev=685202&r1=685201&r2=685202&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.project (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.project Tue Aug 12
08:48:04 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>JSPWiki-SVN-Stripes</name>
+ <name>JSPWiki-Stripes</name>
<comment></comment>
<projects>
</projects>
