299c629a20
Conflicts: CMakeLists.txt configure.ac version |
||
---|---|---|
.. | ||
classic | ||
mobile | ||
xml | ||
Makefile.am |
299c629a20
Conflicts: CMakeLists.txt configure.ac version |
||
---|---|---|
.. | ||
classic | ||
mobile | ||
xml | ||
Makefile.am |