merge from 3.0 branch till 1463.

1 files changed, 42 insertions, 0 deletions

diff --git a/.gitattributes b/.gitattributes
index 80a04237..a48aaa8b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -60,6 +60,26 @@ buildscripts/PhpDocumentor/phpDocumentor/Classes.inc -text
 buildscripts/PhpDocumentor/phpDocumentor/Converter.inc -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/options.ini -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/__tags.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_declaration.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_description.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_list.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constant_details.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constant_summary.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constructor_details.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constructor_summary.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_destructor_details.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_destructor_summary.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_footer.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_get_constant_type.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_header.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inherited_constants.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inherited_methods.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inheritence_tree.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_method_details.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_method_summary.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_sub_classes.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_tags.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/basicindex.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/blank.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/class.tpl -text
@@ -71,6 +91,7 @@ buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/defaul
 buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/docblock.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/elementindex.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/errors.tpl -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/examplesource.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/fileleft.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/filesource.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/footer.tpl -text
@@ -136,8 +157,11 @@ buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoS
 buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoSoft/templates/include.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoSoft/templates/index.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoSoft/templates/media/background.png -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoSoft/templates/media/bg_left.png -text svneol=unset#unset
 buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoSoft/templates/media/empty.png -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoSoft/templates/media/manual.css -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoSoft/templates/media/style.css -text
+buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoSoft/templates/media/stylesheet.css -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoSoft/templates/method.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoSoft/templates/packages.tpl -text
 buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/templates/PradoSoft/templates/page.tpl -text
@@ -310,6 +334,18 @@ buildscripts/PhpDocumentor/user/error.ini -text
 buildscripts/PhpDocumentor/user/pear-makedocs.ini -text
 buildscripts/PhpDocumentor/user/prado.ini -text
 buildscripts/PhpDocumentor/user/testdocbook.ini -text
+buildscripts/chmbuilder/ChmQuickstartBuilder.php -text
+buildscripts/chmbuilder/build.php -text
+buildscripts/chmbuilder/build_child.php -text
+buildscripts/chmbuilder/chm_style.css -text
+buildscripts/chmbuilder/classes/application.xml -text
+buildscripts/chmbuilder/classes/pages/ClassDoc.page -text
+buildscripts/chmbuilder/classes/pages/ClassDoc.php -text
+buildscripts/chmbuilder/classes/pages/Classes.page -text
+buildscripts/chmbuilder/classes/pages/Classes.php -text
+buildscripts/chmbuilder/classes/pages/MainLayout.php -text
+buildscripts/chmbuilder/classes/pages/MainLayout.tpl -text
+buildscripts/chmbuilder/classes/pages/style.css -text
 buildscripts/classtree/DWExtension.php -text
 buildscripts/classtree/DWExtensionReadme.txt -text
 buildscripts/classtree/build.php -text
@@ -598,6 +634,12 @@ buildscripts/texbuilder/time-tracker/db.vsd -text
 buildscripts/texbuilder/time-tracker/pages.php -text
 buildscripts/texbuilder/time-tracker/preface.tex -text
 buildscripts/texbuilder/time-tracker/time-tracker.tex -text
+buildscripts/wikibuilder/DumpSkin.php -text
+buildscripts/wikibuilder/build.php -text
+buildscripts/wikibuilder/dumpHTML.inc -text
+buildscripts/wikibuilder/dumpHTML.php -text
+buildscripts/wikibuilder/external.png -text
+buildscripts/wikibuilder/main.css -text
 demos/blog/index.php -text
 demos/blog/protected/.htaccess -text
 demos/blog/protected/Common/BlogDataModule.php -text