projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b076ec8 0fc0605)
merging extensive changes from prawnsalad/KiwiIRC
authorJack Allnutt <m2ys4u@Gmail.com>
Tue, 18 Sep 2012 22:12:42 +0000 (23:12 +0100)
committerJack Allnutt <m2ys4u@Gmail.com>
Tue, 18 Sep 2012 22:12:42 +0000 (23:12 +0100)
1  2 
client_backbone/css/style.css patch | diff1 | diff2 | blob | history
client_backbone/dev/model_gateway.js patch | diff1 | diff2 | blob | history

diff --cc client_backbone/css/style.css
Simple merge
diff --cc client_backbone/dev/model_gateway.js
index 846044919f7760ee6fd653e3e360eec1635dab2a,31863e8cb4a2df6c5cef56866c30b0eeea35f698..846044919f7760ee6fd653e3e360eec1635dab2a
mode 100755,100644..100755
--- 1/client_backbone/js/model_gateway.js
--- 2/client_backbone/dev/model_gateway.js
+++ b/client_backbone/dev/model_gateway.js