baza na qml
izmenenie
izm
gamemenu i baza na qml
gememenu i baza sdelano
Last commit
vse rabotaet
Merge remote-tracking branch 'refs/remotes/origin/QML_Window_Nadziejka' into QML-dev

Conflicts:
	AS_formsLast/AS_forms.pro
	AS_formsLast/resourses.qrc
Qml Nik
Combobox remaked
Merge remote-tracking branch 'refs/remotes/origin/QML_Window_Nadziejka' into QML-dev

Conflicts:
	AS_formsLast/qml_WINDOW.qml
	AS_formsLast/resourses.qrc
fix gameWindow bug
Merge remote-tracking branch 'refs/remotes/origin/Qml-vadim' into QML-dev

Conflicts:
	AS_formsLast/AButton.qml
	AS_formsLast/AComboBox.qml
	AS_formsLast/ALabel.qml
	AS_formsLast/AS_forms.pro
	AS_formsLast/WINDOW.cpp
	AS_formsLast/WINDOW.h
Revert "Merge remote-tracking branch 'refs/remotes/origin/Qml-vadim' into QML-dev"

This reverts commit 4e48b367850aa7db9d62a4b67cdce6a9727e3b5c, reversing
changes made to 215bdad1505bf2bcfb2d65f6aeaf6a1c35d6befa.
Merge remote-tracking branch 'refs/remotes/origin/Qml-vadim' into QML-dev

Conflicts:
	AS_formsLast/AButton.qml
	AS_formsLast/AComboBox.qml
	AS_formsLast/ALabel.qml
	AS_formsLast/AS_forms.pro
	AS_formsLast/WINDOW.cpp
	AS_formsLast/WINDOW.h (reverse-merged from commit 4e48b367850aa7db9d62a4b67cdce6a9727e3b5c)
fixes