OSDN Git Service

Merge branch 'japaneseSearch' into develop
authoryuki <kimaira7@gmail.com>
Mon, 2 Sep 2013 08:29:20 +0000 (17:29 +0900)
committeryuki <kimaira7@gmail.com>
Mon, 2 Sep 2013 08:29:20 +0000 (17:29 +0900)
commit297fc95a72f3d23fbeeb63304042bf370f9cc13d
treef29c80277b97b0c42edce4b6aefdca38eef9537d
parent042a3190c8fdb10e993988162fcd1f009a874b13
parentb0c314e8eef19aa72ef477c0a96ba5e3b9984684
Merge branch 'japaneseSearch' into develop

Conflicts:
.classpath
src/cx/fbn/nevernote/dialog/ConfigDialog.java
.classpath
src/cx/fbn/nevernote/Global.java
src/cx/fbn/nevernote/NeverNote.java
src/cx/fbn/nevernote/dialog/ConfigDialog.java