Commit [r3286]  Maximize  Restore  History

Merge:

* Merge changes from the 0.9.x branch to trunk.

wrh2 2010-11-30

changed /wiki/trunk
changed /wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/LogItem.java
changed /wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/RecentChange.java
changed /wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/MagicWordUtil.java
changed /wiki/trunk/jamwiki-core/src/test/resources/data/results/Magic_Words2
changed /wiki/trunk/jamwiki-core/src/test/resources/data/results/Template2
changed /wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
changed /wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
changed /wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/contributions.jsp
changed /wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/history.jsp
changed /wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/recent-changes.jsp
changed /wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/watchlist.jsp
/wiki/trunk
Directory.
/wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/LogItem.java Diff Switch to side-by-side view
Loading...
/wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/RecentChange.java Diff Switch to side-by-side view
Loading...
/wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/MagicWordUtil.java Diff Switch to side-by-side view
Loading...
/wiki/trunk/jamwiki-core/src/test/resources/data/results/Magic_Words2 Diff Switch to side-by-side view
Loading...
/wiki/trunk/jamwiki-core/src/test/resources/data/results/Template2 Diff Switch to side-by-side view
Loading...
/wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt Diff Switch to side-by-side view
Loading...
/wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt Diff Switch to side-by-side view
Loading...
/wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/contributions.jsp Diff Switch to side-by-side view
Loading...
/wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/history.jsp Diff Switch to side-by-side view
Loading...
/wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/recent-changes.jsp Diff Switch to side-by-side view
Loading...
/wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/watchlist.jsp Diff Switch to side-by-side view
Loading...

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

JavaScript is required for this form.





No, thanks