diff options
author | Mihael Koep <koep@schneide.com> | 2013-03-14 14:28:53 +0100 |
---|---|---|
committer | Mihael Koep <koep@schneide.com> | 2013-03-14 14:28:53 +0100 |
commit | 1cc9d414e3cc823e9acfdb4c93114e10db42be50 (patch) | |
tree | 704be48adf7217b9fce88b8b7fee1f531016e6dd /tools/gui/control.glade | |
parent | 1649082dabef075d6c3ffaf5c46d9bb46c87e744 (diff) | |
parent | 73246448ec8294d781bb7f223fce395d49bfb6e4 (diff) | |
download | libuca-1cc9d414e3cc823e9acfdb4c93114e10db42be50.tar.gz libuca-1cc9d414e3cc823e9acfdb4c93114e10db42be50.tar.bz2 libuca-1cc9d414e3cc823e9acfdb4c93114e10db42be50.tar.xz libuca-1cc9d414e3cc823e9acfdb4c93114e10db42be50.zip |
Merge branch 'dexela_simple_packaging' into dexela
Conflicts:
plugins/dexela/CMakeLists.txt
plugins/package-plugin.sh.in
Diffstat (limited to 'tools/gui/control.glade')
0 files changed, 0 insertions, 0 deletions