Merge branch 'master' into innershadows
author Hugo Pereira Da Costa
()
committer Hugo Pereira Da Costa
()
commit f48aefbbe457031a124e5629b032d296eddb7b73
tree 1b6b022036439d9bd73b652154c217f048a0731f
parent 74a3c733bb1e26bdce0885e95052405a6293d4e6
parent 4c1c5d9166f8cba1496d47ab1b450b7eb3b9a610
Merge branch 'master' into innershadows
src/oxygengtkicons.cpp
src/oxygengtkicons.h
src/oxygenstylewrapper.cpp