Merge branch '1.2'
author Hugo Pereira Da Costa
()
committer Hugo Pereira Da Costa
()
commit 531e5904c6d5bee9a829e417f613592368b4c5c8
tree 92f3838501e50786478862a3de54afc08009cd82
parent c5a8a2956308e480a850f3f8d656a679efc34a79
parent 104772c65e53b954ed78c9da89d7827b327ec075
Merge branch '1.2'
src/animations/oxygentoolbarstatedata.cpp
src/animations/oxygentoolbarstatedata.h
src/animations/oxygentoolbarstateengine.h
src/oxygenstylewrapper.cpp