From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 26 Jun 2007 15:32:45 +0000 (+0200)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
X-Git-Url: http://dolda2000.com/gitweb/?p=kokare.git;a=commitdiff_plain;h=afa1509c3b4d5954dfd419cc79b500835a468289;hp=076a6cc9e851011927ce11393e3850dd4a016db5

Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
---

diff --git a/kokare.c b/kokare.c
index c475e80..8a42f6b 100644
--- a/kokare.c
+++ b/kokare.c
@@ -228,7 +228,7 @@ int main(void)
 	calcavg();
 	triaccycle();
 
-#if 0
+#if 1
 	/*
 	 * User interface
 	 */
@@ -292,7 +292,6 @@ int main(void)
 	}
 #endif
 #if 1
-#endif
 	/*
 	 * ZVD debug
 	 */
@@ -302,6 +301,7 @@ int main(void)
 	    display(cur);
 	    zok = 0;
 	}
+#endif
 #if 0
 	/*
 	  Phony Triac control