Hyunin Song
0a5d056bdb
Merge branch 'stable-1.2'
# Conflicts:
# .travis/osx..install.sh
# .travis/osx..script.sh
# cmake/linux/package_linux.sh.in
# data/locale/en.ts
# src/core/CMakeLists.txt
# src/core/ProjectRenderer.cpp
# src/gui/FileBrowser.cpp
2018-03-07 23:54:28 +09:00
..
2014-02-17 17:59:09 +02:00
2017-11-24 15:39:53 +01:00
2017-06-25 00:47:32 +03:00
2017-06-25 00:47:32 +03:00
2008-06-30 02:13:45 +00:00
2014-02-17 17:59:09 +02:00
2014-02-17 17:59:09 +02:00
2018-03-07 23:54:28 +09:00
2018-01-26 10:48:46 -05:00