11 Commits

Author SHA1 Message Date
Andrey Akhmichin
78139bfb91 Merge branch 'sohl1.2' into halloween 2020-01-07 17:57:35 +05:00
Andrey Akhmichin
aa9106ae72 Double promotion fixes. 2020-01-07 17:53:03 +05:00
Andrey Akhmichin
7b792db31f Merge branch 'sohl1.2' into halloween 2020-01-01 04:49:44 +05:00
Andrey Akhmichin
e03788de52 Merge branch 'master' into sohl1.2 2020-01-01 04:46:25 +05:00
Andrey Akhmichin
9fb438640d Merge branch 'sohl1.2' into halloween 2019-11-17 17:45:49 +05:00
Andrey Akhmichin
16e0a45d3c Merge branch 'master' into sohl1.2 2019-11-11 04:00:45 +05:00
Night Owl
f671e2e438 Merge branch 'sohl1.2' into halloween 2018-10-08 14:11:12 +05:00
Night Owl
b56ccf594d Update islave_deamon.cpp. 2018-02-16 12:36:01 +05:00
Night Owl
b31b4e86b2 Fix some warnings. 2018-02-12 21:09:39 +05:00
Roman Chistokhodov
30f2409952 Merge branch 'master' into sohl1.2 2017-12-18 23:47:12 +03:00
Roman Chistokhodov
22026b90b5 Spirit 1.2 2017-12-18 02:39:44 +03:00