OSDN Git Service

Merge branch 'master' of http://git.code.sf.net/p/nevernote/code into develop
authoryuki <kimaira7@gmail.com>
Mon, 11 Nov 2013 08:58:54 +0000 (17:58 +0900)
committeryuki <kimaira7@gmail.com>
Mon, 11 Nov 2013 08:58:54 +0000 (17:58 +0900)
commitea94dfeb4e955c79616af64448be1a8fd09c23d3
treeec22fbc14e0be9c3e0f8eec55a1032ffa1d99bac
parentb6188d12a21b271de928d081f11dfae1e891b95c
parent770b7b5557464890faf17a8116f41b756c686ed6
Merge branch 'master' of git.code.sf.net/p/nevernote/code into develop

Conflicts:
src/cx/fbn/nevernote/Global.java
src/cx/fbn/nevernote/oauth/OAuthWindow.java
src/cx/fbn/nevernote/threads/SyncRunner.java
src/cx/fbn/nevernote/Global.java
src/cx/fbn/nevernote/NeverNote.java
src/cx/fbn/nevernote/threads/SyncRunner.java