0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

merging changes

Browse source
This commit is contained in:
rolux 2010-07-05 19:05:31 +02:00
parent b42ba9534e
commit b90587e048
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/js/ox.ui.js
View file

@ -4271,12 +4271,7 @@ 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 {