summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorMihael Koep <koep@schneide.com>2013-03-14 14:28:53 +0100
committerMihael Koep <koep@schneide.com>2013-03-14 14:28:53 +0100
commit1cc9d414e3cc823e9acfdb4c93114e10db42be50 (patch)
tree704be48adf7217b9fce88b8b7fee1f531016e6dd /CMakeLists.txt
parent1649082dabef075d6c3ffaf5c46d9bb46c87e744 (diff)
parent73246448ec8294d781bb7f223fce395d49bfb6e4 (diff)
downloaduca-1cc9d414e3cc823e9acfdb4c93114e10db42be50.tar.gz
uca-1cc9d414e3cc823e9acfdb4c93114e10db42be50.tar.bz2
uca-1cc9d414e3cc823e9acfdb4c93114e10db42be50.tar.xz
uca-1cc9d414e3cc823e9acfdb4c93114e10db42be50.zip
Merge branch 'dexela_simple_packaging' into dexela
Conflicts: plugins/dexela/CMakeLists.txt plugins/package-plugin.sh.in
Diffstat (limited to 'CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions