OSDN Git Service

Merge branch 'master' of git://gitorious.org/mypaint/mypaint
authorsigetch <sigetch@users.sourceforge.jp>
Wed, 23 Nov 2011 16:40:20 +0000 (01:40 +0900)
committersigetch <sigetch@users.sourceforge.jp>
Wed, 23 Nov 2011 16:40:20 +0000 (01:40 +0900)
commit9a3cc44a741a45322240b084ad071ce404d4a937
tree7a1031fb2d8f1ed8d23124c6698c7e76763f2fb3
parenta41205609751080728ce51e77416467bd5e0fb40
parentf4bd5a45515b8a0912765d2a7105a3fa42b1e74c
Merge branch 'master' of git://gitorious.org/mypaint/mypaint

Conflicts:
po/ja.po
gui/document.py
po/ja.po