OSDN Git Service

Merge remote-tracking branch 'origin/only-one-send-queue'
authoreagletmt <eagletmt@gmail.com>
Wed, 17 Oct 2012 06:54:57 +0000 (15:54 +0900)
committereagletmt <eagletmt@gmail.com>
Wed, 17 Oct 2012 06:54:57 +0000 (15:54 +0900)
commit9c81049fc50ffaf96ea148b74461534d295e6e11
tree64eb12e796d8355c12ce0ca96cd96df11d22df10
parent35fddb97c83f282130fef999e0021a0e612a0ea9
parent044d2cf9ebe34e00b03f0538fba8c11596ebd0cd
Merge remote-tracking branch 'origin/only-one-send-queue'

Conflicts:
CUTEn/AndroidManifest.xml
CUTEn/src/jp/ac/titech/sharp4k/cuten/LectureActivity.java
CUTEn/AndroidManifest.xml
CUTEn/src/jp/ac/titech/sharp4k/cuten/LectureActivity.java
CUTEn/src/jp/ac/titech/sharp4k/cuten/LectureFolderActivity.java