From 835c848933f5cbf92ef78e99517f158c0c80769e Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Mon, 25 Jun 2012 21:22:20 +0200
Subject: [PATCH] in ox loader, don't overwrite previous Ox

---
 source/Ox.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/source/Ox.js b/source/Ox.js
index 9c4b6186..fa8e0a96 100644
--- a/source/Ox.js
+++ b/source/Ox.js
@@ -12,8 +12,14 @@
                 time = +new Date();
 
             loadJSON(function(data) {
+                var previousOx = global.Ox;
                 loadScriptsSerial(data.files, function() {
                     Ox.VERSION = data.version;
+                    Ox.forEach(previousOx, function(value, key) {
+                        if (Ox.isUndefined(Ox[key])) {
+                            Ox[key] = value;
+                        }
+                    });
                     Ox.load.apply(null, args);
                 });
             });