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

Change-Id: Ibf1ece8a23f7c320c133b45f20beaf370e9dd169
Data branch

Change-Id: I3061b5fa0f47954b1ab6eaa66b73eafb67eebbf3
tabel
k
k
Merge branch 'Data' of github.com:hbnn/Python_PYQT into Data

Conflicts:
	My_module/Data_base/editdialog.py
	My_module/Data_base/lina.db
Data branch

Change-Id: I3061b5fa0f47954b1ab6eaa66b73eafb67eebbf3
Merge remote-tracking branch 'origin/Data' into Data

Conflicts:
	My_module/_eric4project/My_1st.e4q
	My_module/_eric4project/My_1st.e4t

Change-Id: I9eb8acb3c7d88f04f7934fa1b61f9fb173a5e1c9
Merge branch 'Data' of github.com:hbnn/Python_PYQT into Data

Conflicts:
	My_module/_eric4project/My_1st.e4q
	My_module/_eric4project/My_1st.e4t

Change-Id: I5ff36f8963a20a338182156c0ea365bdf297bb61
The new version is more perfect and more complete than before,however,there are still plenty of work to do
Merge branch 'Data' of github.com:hbnn/Python_PYQT into Data

Conflicts:
	My_module/_eric4project/My_1st.e4q
	My_module/_eric4project/My_1st.e4t

Change-Id: I5ff36f8963a20a338182156c0ea365bdf297bb61
The new version is more perfect and more complete than before,however,there are still plenty of work to do
Merge branch 'Data' of github.com:hbnn/Python_PYQT into Data

Conflicts:
	My_module/_eric4project/My_1st.e4q
	My_module/_eric4project/My_1st.e4t

Change-Id: I5ff36f8963a20a338182156c0ea365bdf297bb61
Merge remote-tracking branch 'origin/Data' into Data

Conflicts:
	My_module/_eric4project/My_1st.e4q
	My_module/_eric4project/My_1st.e4t

Change-Id: I5115ecef9330af4b5631da12efa7c8b946f38c1a
In branch Data,the files is differnet from master,the files in master is more than Data
Merge tag 'v7.2' of github.com:hbnn/Python_PYQT into Data

Conflicts:
	My_module/Data_base/lina.db
	My_module/Data_base/qrc_resources.pyc
	My_module/My_1st.e4p
	My_module/_eric4project/My_1st.e4q
	My_module/_eric4project/My_1st.e4q~
	My_module/_eric4project/My_1st.e4t
	My_module/_eric4project/My_1st.e4t~

Change-Id: I00d5b48bf1a055a59206a735452dc2c8ae6ea6de
Merge branch 'master' of github.com:hbnn/Python_PYQT

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

Change-Id: Idc1fa707eb910c20709b179881c67fa1a02f13f5