Update of 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-plugin/src/test/java/org/xdoclet/plugin/plugin
In directory 
sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-plugin/src/test/java/org/xdoclet/plugin/plugin

Modified Files:
        ExamplePlugin.confluence 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide 
standard 
merge capabilities


Index: ExamplePlugin.confluence
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-plugin/src/test/java/org/xdoclet/plugin/plugin/ExamplePlugin.confluence,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ExamplePlugin.confluence    11 Dec 2005 15:04:23 -0000      1.6
--- ExamplePlugin.confluence    24 Sep 2006 11:58:56 -0000      1.7
***************
*** 12,20 ****
  |encoding |false | | | |
  |multioutput |false | | | |
  |outputValidator |false | | | |
  |fileregex |false | | | |
  |filereplace |false | | | |
  |packageregex |false | | | |
  |packagereplace |false | | | |
- |destdir |false | | | |
- |validate |false | | | |
--- 12,21 ----
  |encoding |false | | | |
  |multioutput |false | | | |
+ |mergedir |false | | | |
  |outputValidator |false | | | |
+ |validate |false | | | |
+ |destdir |false | | | |
  |fileregex |false | | | |
  |filereplace |false | | | |
  |packageregex |false | | | |
  |packagereplace |false | | | |


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits

Reply via email to