You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/08/12 17:34:01 UTC

svn commit: r685182 - /incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.settings/org.eclipse.core.resources.prefs

Author: ajaquith
Date: Tue Aug 12 08:34:01 2008
New Revision: 685182

URL: http://svn.apache.org/viewvc?rev=685182&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 685086.

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.settings/org.eclipse.core.resources.prefs

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.settings/org.eclipse.core.resources.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.settings/org.eclipse.core.resources.prefs?rev=685182&r1=685181&r2=685182&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.settings/org.eclipse.core.resources.prefs (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.settings/org.eclipse.core.resources.prefs Tue Aug 12 08:34:01 2008
@@ -1,4 +1,9 @@
-#Sun Aug 03 08:35:09 EDT 2008
+#Sun Jun 29 18:40:26 EEST 2008
 eclipse.preferences.version=1
 encoding//etc/i18n/templates/default_de.properties=ISO-8859-1
+encoding//src/wikipages/fi/ApprovalRequiredForPageChanges.txt=UTF-8
+encoding//src/wikipages/fi/ApprovalRequiredForUserProfiles.txt=UTF-8
+encoding//src/wikipages/fi/EditFindAndReplaceHelp.txt=UTF-8
+encoding//src/wikipages/fi/MoreMenu.txt=UTF-8
+encoding//src/wikipages/fi/TitleBox.txt=UTF-8
 encoding/<project>=ISO-8859-1