OSDN Git Service

(root) / nicownn / NicoWnn.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: daa5d0d 32c1b46)
Merge branch 'master' of ssh://hiroshica02@git.sourceforge.jp/gitroot/nicownn/NicoWnn
authorHiromitsu Shioya <hiroshica@gmail.com>
Thu, 14 Jan 2010 15:43:48 +0000 (00:43 +0900)
committerHiromitsu Shioya <hiroshica@gmail.com>
Thu, 14 Jan 2010 15:43:48 +0000 (00:43 +0900)
Conflicts:
AndroidManifest.xml


Trivial merge
NicoWnnソース
About OSDN
Find Software
Develop Software
Help