From 8689630e50c5861501799fdf540342b6961259fd Mon Sep 17 00:00:00 2001
From: rolux <rolux@pandora>
Date: Mon, 5 Jul 2010 19:01:42 +0200
Subject: [PATCH] merging changes

---
 build/js/ox.ui.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js
index 13b2d31..20aff34 100644
--- a/build/js/ox.ui.js
+++ b/build/js/ox.ui.js
@@ -4271,13 +4271,18 @@ requires
             );            
 
         function parseKeyboard(str) {
+<<<<<<< TREE
+            Ox.print("str", str, options)
             if (Ox.isObject(str)) return str; // fixme: this should not happen
+=======
+            if (Ox.isObject(str)) return str; // fixme: this should not happen
+>>>>>>> MERGE-SOURCE
             var modifiers = str.split(" "),
                 key = modifiers.pop();
             return {
                 modifiers: modifiers,
                 key: key
-            }
+            };
         }
 
         self.onChange = function(key, value) {