Merge branch '1.2' into gtk3
author Hugo Pereira Da Costa
()
committer Hugo Pereira Da Costa
()
commit 9f361ab8f079a64953bbb8fe4968abdae240e03e
tree 222e5b54b08dc1b3c89f75dc084624c982d1c1fe
parent 845659cf289b4d60fa65619460a33dd4aa9dc64c
parent 2c6af31a671208d910643a1025b59eb17f89a357
Merge branch '1.2' into gtk3
src/animations/oxygentimeline.cpp
src/animations/oxygentimeline.h
src/oxygenqtsettings.cpp