Merge default to ios-develop ios-develop
authorantonc27 <antonc27@mail.ru>
Sun, 10 Jun 2018 19:12:26 +0200
branchios-develop
changeset 13418 ba39a1d396c0
parent 13416 6e8b807bda4b (diff)
parent 13417 236cc4cf2448 (current diff)
Merge default to ios-develop
QTfrontend/model/ammoSchemeModel.cpp
QTfrontend/model/ammoSchemeModel.h
QTfrontend/ui/dialog/upload_video.cpp
QTfrontend/ui/dialog/upload_video.h
cmake_modules/CheckHaskellModuleExists.cmake
share/hedgewars/Data/Graphics/Hats/Luigi.svg
share/hedgewars/Data/Graphics/Hats/Mario.svg
share/hedgewars/Data/Graphics/Hats/PrincessPeach.svg
share/hedgewars/Data/Graphics/Hats/Toad.svg
share/hedgewars/Data/Graphics/Hats/Wario.svg
share/hedgewars/Data/Graphics/Hats/pikachu.svg
share/hedgewars/Data/Missions/Campaign/01-Boot_Camp.lua