Merge remote-tracking branch 'origin/master'

author amayav <vamayav@yahoo.co.jp>

Wed, 29 Feb 2012 04:41:15 +0000 (13:41 +0900)

committer amayav <vamayav@yahoo.co.jp>

Wed, 29 Feb 2012 04:45:18 +0000 (13:45 +0900)
author amayav <vamayav@yahoo.co.jp>
Wed, 29 Feb 2012 04:41:15 +0000 (13:41 +0900)
committer amayav <vamayav@yahoo.co.jp>
Wed, 29 Feb 2012 04:45:18 +0000 (13:45 +0900)
diff --cc CommandoJikkyouSennyou.pro

index 33ea481,33ea481..039e31a
--- 1/CommandoJikkyouSennyou.pro
--- 2/CommandoJikkyouSennyou.pro
+++ b/CommandoJikkyouSennyou.pro
@@@ -56,3 -56,3 +56,6 @@@ INCLUDEPATH += 
   DEPENDPATH += \
       $$PWD/kqoauth-kqoauth/src \
       $$PWD/kqoauth-kqoauth/include
++
++OTHER_FILES += \
++    README
author	amayav <vamayav@yahoo.co.jp>
	Wed, 29 Feb 2012 04:41:15 +0000 (13:41 +0900)
committer	amayav <vamayav@yahoo.co.jp>
	Wed, 29 Feb 2012 04:45:18 +0000 (13:45 +0900)