2.0 doc
Merge branch 'master' of github.com:noyobo/xplayer