modified:   src/ui/vs_plugins/jo_player/decode/BTKDecodeH264.cpp
	modified:   src/ui/vs_plugins/jo_player/decode/BTKDecodeH264.h
	modified:   src/ui/vs_plugins/jo_player/decode/BTKTransform.cpp
	modified:   src/ui/vs_plugins/jo_player/include/DefaultConfig.h
	modified:   src/ui/vs_plugins/jo_player/input/BTKInput.cpp
	modified:   src/ui/vs_plugins/pl_player/pl_reconn.cpp
	modified:   src/ui/vs_plugins/pl_player/pl_wnd.cpp
	deleted:    src/ui/vs_plugins/pl_ui/PngButton.cpp
	deleted:    src/ui/vs_plugins/pl_ui/PngButton.h
	modified:   src/ui/vs_plugins/pl_ui/pl_full_wnd.cpp
	modified:   src/ui/vs_plugins/pl_ui/pl_toolbar.cpp
	modified:   src/ui/vs_plugins/pl_ui/pl_toolbar.h
	modified:   vs2008/jonpl/pl_player.vcproj
	new file:   src/ui/vs_plugins/pl_ui/pl_button.cpp
	new file:   src/ui/vs_plugins/pl_ui/pl_button.h
	modified:   src/ui/vs_plugins/jo_player/decode/BTKTransform.cpp
	modified:   src/ui/vs_plugins/jo_player/input/BTKInput.cpp
	modified:   src/ui/vs_plugins/jo_player/misc/network/BTKSockt.cpp
	modified:   src/ui/vs_plugins/jo_player/src/BTKControl.cpp
	modified:   src/ui/vs_plugins/pl_core/pl_player.h
	modified:   src/ui/vs_plugins/pl_core/pl_type.h
	modified:   src/ui/vs_plugins/pl_hik/HikPlayer.cpp
	modified:   src/ui/vs_plugins/pl_hik/HikPlayer.h
	modified:   src/ui/vs_plugins/pl_jo/BTKPlayer.cpp
	modified:   src/ui/vs_plugins/pl_jo/BTKPlayer.h
	modified:   src/ui/vs_plugins/pl_player/pl_manager.cpp
	modified:   src/ui/vs_plugins/pl_player/pl_manager.h
	modified:   src/ui/vs_plugins/pl_player/pl_reconn.cpp
	modified:   src/ui/vs_plugins/pl_vlc/VlcPlayer.cpp
	modified:   src/ui/vs_plugins/pl_vlc/VlcPlayer.h
	modified:   src/ui/vs_plugins/jo_player/decode/BTKTransform.cpp
	modified:   src/ui/vs_plugins/jo_player/include/BTKInput.h
	modified:   src/ui/vs_plugins/jo_player/include/BTKRender.h
	modified:   src/ui/vs_plugins/jo_player/include/BTKTransform.h
	modified:   src/ui/vs_plugins/jo_player/input/BTKAccessRYSP.cpp
	modified:   src/ui/vs_plugins/jo_player/input/BTKInput.cpp
	modified:   src/ui/vs_plugins/jo_player/misc/network/BTKSockt.cpp
	modified:   src/ui/vs_plugins/jo_player/output/BTKRender.cpp
	modified:   src/ui/vs_plugins/jo_player/output/BTKVoutDDraw.cpp
	modified:   src/ui/vs_plugins/jo_player/src/BTKControl.cpp
	modified:   src/ui/vs_plugins/pl_core/pl_type.h
	modified:   src/ui/vs_plugins/pl_jo/BTKPlayer.cpp
	modified:   src/ui/vs_plugins/pl_player/pl_reconn.cpp
	modified:   src/ui/vs_plugins/jo_player/include/BTKLog.h
	modified:   src/ui/vs_plugins/jo_player/misc/file/BTKLog.cpp
	modified:   src/ui/vs_plugins/jo_player/misc/network/BTKSockt.cpp
	modified:   src/ui/vs_plugins/jo_player/src/BTKControl.cpp
	modified:   src/ui/vs_plugins/np_plugin/src/np_plugin.cpp
	modified:   src/ui/vs_plugins/pl_core/pl_type.h
	modified:   src/ui/vs_plugins/pl_player/pl_ctrl.cpp
	modified:   src/ui/vs_plugins/pl_player/pl_ctrl.h
	modified:   src/ui/vs_plugins/pl_player/pl_factory_wnd.cpp
	modified:   src/ui/vs_plugins/pl_player/pl_factory_wnd.h
	modified:   src/ui/vs_plugins/pl_player/pl_wnd.cpp
	modified:   src/ui/vs_plugins/pl_player/pl_wnd.h
	modified:   src/ui/vs_plugins/pl_ui/pl_real_wnd.cpp
	modified:   src/ui/vs_plugins/pl_ui/pl_toolbar.cpp
	modified:   src/ui/vs_plugins/pl_ui/pl_toolbar.h
	modified:   src/ui/vs_plugins/pl_ui/pl_vod_wnd.cpp
Merge branch 'master' of https://github.com/joorhy/jorhy-prj