tree 9abd6ac5f8304783e1c88a135dceed24fbebc703
parent 9d6bbe238b17e51e9bbd45536fabdf0b5aa9cb15
author bell-sw <liberica@bell-sw.com> 1550044026 +0300
committer Alexey Ushakov <alexey.v.ushakov@gmail.com> 1550215670 +0300

Resolved merge conflicts:
common/autoconf/flags.m4
common/autoconf/generated-configure.sh