Merge branch 'master' into gtk3
author Hugo Pereira Da Costa
()
committer Hugo Pereira Da Costa
()
commit 4ad14ffcbcf02d08e49d0f0dfa09ea4811943aaa
tree 7b21258425249bbf6cacb4e6292d71fdb6b7aec0
parent 50a8681bd3292dd758d30b3c6c3a6ca7aac250d1
parent e1a3c66888b3d1fe6a2cd15d6a13a71a766e98a0
Merge branch 'master' into gtk3
src/oxygenstyle.cpp