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
..
2008-05-25 10:08:53 +00:00
2017-03-26 22:06:43 +02:00
2018-01-17 17:05:38 -05:00
2008-05-17 15:28:34 +00:00
2008-05-17 15:28:34 +00:00
2017-11-22 11:08:47 +01:00
2017-02-06 02:41:15 +02:00
2008-05-17 15:28:34 +00:00
2009-02-27 00:25:59 +01:00
2008-05-17 15:28:34 +00:00
2008-05-17 15:28:34 +00:00