diff options
| author | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
|---|---|---|
| committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
| commit | b5fad9feefd0f261807222d8a4c42ead6253a65c (patch) | |
| tree | 399cd4a1b79f61530924ea59670af0bdd6cee5be /doc/html/functions_func_0x72.html | |
| parent | 89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff) | |
| parent | b29a968be8df52cd7c9b6d5bebb618534788337c (diff) | |
| download | volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2 volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip | |
Fix merge conflict
Diffstat (limited to 'doc/html/functions_func_0x72.html')
| -rw-r--r-- | doc/html/functions_func_0x72.html | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/html/functions_func_0x72.html b/doc/html/functions_func_0x72.html index f01b1c583..008a79586 100644 --- a/doc/html/functions_func_0x72.html +++ b/doc/html/functions_func_0x72.html @@ -152,14 +152,17 @@ $(document).ready(function(){initNavTree('functions_func_0x72.html','');}); : <a class="el" href="classTemplate.html#a285b5b2007dbbf733476273df3fed4ef">Template</a> </li> <li>replace_macros() -: <a class="el" href="classTemplate.html#a07737733f6949bdedea1e3d301b2ab7b">Template</a> -, <a class="el" href="interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243">ITemplateEngine</a> +: <a class="el" href="interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243">ITemplateEngine</a> +, <a class="el" href="classTemplate.html#a07737733f6949bdedea1e3d301b2ab7b">Template</a> , <a class="el" href="classFriendicaSmartyEngine.html#ad62f1181d2f02b54b46731ad2bd46db2">FriendicaSmartyEngine</a> </li> <li>rotate() -: <a class="el" href="classphoto__imagick.html#a9df5738a4a18e76dd304c440e96f045f">photo_imagick</a> +: <a class="el" href="classphoto__gd.html#a77f87730b11093b76980c541159df37d">photo_gd</a> , <a class="el" href="classphoto__driver.html#a2f2b6337cf9aa0688d10b422123f0eec">photo_driver</a> -, <a class="el" href="classphoto__gd.html#a77f87730b11093b76980c541159df37d">photo_gd</a> +, <a class="el" href="classphoto__imagick.html#a9df5738a4a18e76dd304c440e96f045f">photo_imagick</a> +</li> +<li>run() +: <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7">Redmatrix\Import\Import</a> </li> </ul> </div><!-- contents --> |