# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1366749009 -7200
# Node ID a60a450b8f3bbae74cb57646f3c65f463882599f
# Parent  f978d70a9e639576a1e78ef8c3c5e9e00b335480# Parent  8786006c553ce05fa0c6c30df451119f9fa1b93f
Merge with 8786006c553ce05fa0c6c30df451119f9fa1b93f

diff -r f978d70a9e63 -r a60a450b8f3b client/css/renkan.css
diff -r f978d70a9e63 -r a60a450b8f3b client/js/defaults.js
diff -r f978d70a9e63 -r a60a450b8f3b client/js/main.js
diff -r f978d70a9e63 -r a60a450b8f3b client/js/paper-renderer.js