Merge branch 'experimental'

Conflicts:
	CommandoJikkyouSennyou.pro

diff --cc CommandoJikkyouSennyou.pro
index a975a43,5111944..33ea481
--- 1/CommandoJikkyouSennyou.pro
--- 2/CommandoJikkyouSennyou.pro
+++ b/CommandoJikkyouSennyou.pro
@@@ -46,19 -40,8 +40,7 @@@ HEADERS  += 
      extrapushbutton.h \
      picojson.h \
      widgetdomain.h \
-     latesttweetsfortime.h \
-     kqoauth-kqoauth/src/kqoauthutils.h \
-     kqoauth-kqoauth/src/kqoauthrequest_xauth_p.h \
-     kqoauth-kqoauth/src/kqoauthrequest_xauth.h \
-     kqoauth-kqoauth/src/kqoauthrequest_p.h \
-     kqoauth-kqoauth/src/kqoauthrequest_1.h \
-     kqoauth-kqoauth/src/kqoauthrequest.h \
-     kqoauth-kqoauth/src/kqoauthmanager_p.h \
-     kqoauth-kqoauth/src/kqoauthmanager.h \
-     kqoauth-kqoauth/src/kqoauthglobals.h \
-     kqoauth-kqoauth/src/kqoauthauthreplyserver_p.h \
-     kqoauth-kqoauth/src/kqoauthauthreplyserver.h
- 
+     latesttweetsfortime.h
 -
  FORMS    += \
      widget.ui
  
@@@ -74,18 -57,14 +56,3 @@@ INCLUDEPATH += 
  DEPENDPATH += \
      $$PWD/kqoauth-kqoauth/src \
      $$PWD/kqoauth-kqoauth/include
- 
- OTHER_FILES += \
-     kqoauth-kqoauth/src/src.pro \
-     kqoauth-kqoauth/src/kqoauthd_resource.rc
--
--
--
--
--
--
--
--
--
--
--

diff --cc README
index 0000000,0000000..0c4b880
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/README
@@@ -1,0 -1,0 +1,13 @@@
++CommandoJikkyouSennyou and the source is licensed under the GNU Lesser General Public
++License (LGPL). For more information, visit http://www.gnu.org/licenses/lgpl.html
++This library is written by amayav (vamayav@yahoo.co.jp)
++
++
++This application is using following files.
++
++kqoauth library and the source is licensed under the GNU Lesser General Public
++License (LGPL). For more information, visit http://www.gnu.org/licenses/lgpl.html
++This library is written by Johan Paul (johan.paul@gmail.com)
++
++picojson is licensed under 2-clause BSD license.
++This parser is provided by Cybozu Labs (http://coderepos.org/share/browser/lang/cplusplus/picojson/trunk/picojson.h).