Merge branch 'master' into gregoa

[gregoa/zavai.git] / zavai / __init__.py

diff --git a/zavai/__init__.py b/zavai/__init__.py
index b349c43c3d8fc861c7d1969c87c53ec9a4960fb0..4d48db96e60671899354fa5e1e6b16a74627c685 100644 (file)
--- a/zavai/__init__.py
+++ b/zavai/__init__.py
@@ -17,11 +17,15 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from conf import read_config
+from config import Config
 from plugins import load_plugins
-from registry import Registry, Resource
-from menu import Menu, MenuLink, MenuButton
-from app import Zavai
+from registry import Registry, Resource, Service, get_parent, default_label
+from menu import Menu, MenuButton, LinkButton, ToggleButton
+from app import Zavai, Applet
 from gps import GPS, GPX
+from audio import Audio, Recorder
+
+VERSION="0.1"
 
 def warn(*args):
     import sys
@@ -33,3 +37,4 @@ def info(*args):
 def set_quiet():
     def info(*args):
         pass
+