d
Yes,Merge branch 'master' of github.com:hbnn/Python_PYQT

Conflicts:
	My_module/My_1st.e4p
	My_module/Ui_UI_main1.pyc
	My_module/_eric4project/My_1st.e4q
	My_module/_eric4project/My_1st.e4t
	My_module/qrc_resources.pyc
2013nian