[Jamwiki-commit] SF.net SVN: jamwiki:[3316] wiki/branches/michael-o/pom_improvement

[<mic...@us...>]

Revision: 3316
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3316&view=rev
Author:   michael-o
Date:     2010-12-12 18:54:14 +0000 (Sun, 12 Dec 2010)

Log Message:
-----------
Merged with trunk

Modified Paths:
--------------
    wiki/branches/michael-o/pom_improvement/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/AbstractHeadingTag.java
    wiki/branches/michael-o/pom_improvement/jamwiki-core/src/main/java/org/jamwiki/utils/Pagination.java
    wiki/branches/michael-o/pom_improvement/jamwiki-core/src/main/resources/pages/StyleSheet.txt
    wiki/branches/michael-o/pom_improvement/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/michael-o/pom_improvement/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/michael-o/pom_improvement/jamwiki-war/src/main/webapp/WEB-INF/jsp/category-include.jsp
    wiki/branches/michael-o/pom_improvement/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/michael-o/pom_improvement/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/michael-o/pom_improvement/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java

Added Paths:
-----------
    wiki/branches/michael-o/pom_improvement/jamwiki-core/src/test/resources/data/results/TableOfContents6
    wiki/branches/michael-o/pom_improvement/jamwiki-core/src/test/resources/data/results/TableOfContents7
    wiki/branches/michael-o/pom_improvement/jamwiki-core/src/test/resources/data/topics/TableOfContents6
    wiki/branches/michael-o/pom_improvement/jamwiki-core/src/test/resources/data/topics/TableOfContents7

Property Changed:
----------------
    wiki/branches/michael-o/pom_improvement/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.