From f09ac4e5972a77dfe73338ee207e40ec463355e9 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sat, 3 Aug 2013 00:18:14 +0200
Subject: Revert "Revert "merge""

This reverts commit 9294f72adb3c076932558b6f29a4c570e7962764.
---
 doc/html/globals_0x69.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'doc/html/globals_0x69.html')

diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html
index 67ac9bf88..be74f1d28 100644
--- a/doc/html/globals_0x69.html
+++ b/doc/html/globals_0x69.html
@@ -161,7 +161,7 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
 , <a class="el" href="theme_2redstrap_2php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762">default.php</a>
 , <a class="el" href="php2po_8php.html#a45b05625748f412ec97afcd61cf7980b">php2po.php</a>
 , <a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">style.php</a>
-, <a class="el" href="php_2default_8php.html#a2a9b3d213aeeef28c4393ba8f7b408a4">default.php</a>
+, <a class="el" href="php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762">default.php</a>
 , <a class="el" href="full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db">full.php</a>
 </li>
 <li>import_author_xchan()
@@ -185,6 +185,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
 <li>import_profile_photo()
 : <a class="el" href="photo__driver_8php.html#a102f3f26f67e0e38f4322a771951c1ca">photo_driver.php</a>
 </li>
+<li>import_site()
+: <a class="el" href="zot_8php.html#a2657e141d62d5f67ad3c87651b585299">zot.php</a>
+</li>
 <li>import_xchan()
 : <a class="el" href="zot_8php.html#ab0227978011d8601494a7651fa26acf0">zot.php</a>
 </li>
@@ -263,6 +266,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
 <li>ITEM_NSFW
 : <a class="el" href="boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08">boot.php</a>
 </li>
+<li>ITEM_OBSCURED
+: <a class="el" href="boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d">boot.php</a>
+</li>
 <li>ITEM_ORIGIN
 : <a class="el" href="boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7">boot.php</a>
 </li>
-- 
cgit v1.2.3