OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Fri, 16 Jan 2015 09:20:23 +0000 (18:20 +0900)
committeryasushiito <yas@pen-chan.jp>
Fri, 16 Jan 2015 09:20:23 +0000 (18:20 +0900)
commit205fd6b371a992e6e1a2c0bbfd6566af7a606937
treef1d8bd08ff5889281fda69909d38c9946deb5426
parentf9d7686078927e5f2b48cc590057fd22c8d16b00
parent3372fc6b4bd5f18281df4237ead994b527538936
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/editor/panel_editor/dock.js.coffee