merge.txt

respire-air:wsc Henry$ git checkout dev
Switched to branch 'dev'
respire-air:wsc Henry$ git merge --no-ff setting-box
Merge made by recursive.
 css/_control.scss        |   80 +-
 css/_helpers.scss        |   45 +
 css/_nav.scss            |  123 ++-
 css/_popup.scss          |   24 +
 css/_settings.scss       |  152 +++
 css/_theme_template.scss |  118 ++-
 css/wsc.scss             |   19 +-
 dAmn_example.html        |   11 +-
 dist/chatterbox.js       | 2060 +++++++++++++++++++++++++++++++++++++++---
 dist/chatterbox.min.js   |   60 +-
 dist/wsc.css             |  482 ++++++++--
 dist/wsc.dAmn.js         | 2298 ++++++++++++++++++++++++++++++++++++++++++++--
 dist/wsc.dAmn.min.js     |  124 ++-
 dist/wsc.js              | 2283 +++++++++++++++++++++++++++++++++++++++++++--
 dist/wsc.min.css         |   48 +-
 dist/wsc.min.js          |  132 ++-
 src/base.js              |   26 +
 src/client.js            |   11 +-
 src/commands.js          |  190 ++++
 src/control.js           |   28 +-
 src/dAmn/base.js         |    3 +-
 src/dAmn/extension.js    |    6 +
 src/dAmn/icon.js         |    6 +
 src/lib.js               |   32 +
 src/protocol.js          |    4 +-
 src/tablumps.js          |   12 +-
 src/ui/base.js           |   46 +-
 src/ui/channel.js        |   69 ++-
 src/ui/chatbook.js       |   28 +
 src/ui/control.js        |   72 ++-
 src/ui/nav.js            |   64 ++-
 src/ui/settings.js       | 1242 +++++++++++++++++++++++++
 src/ui/templates.js      |  385 ++++++++-
 33 files changed, 9617 insertions(+), 666 deletions(-)
 create mode 100644 css/_helpers.scss
 create mode 100644 css/_popup.scss
 create mode 100644 css/_settings.scss
 create mode 100644 src/ui/settings.js