diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-21 15:46:53 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-21 15:46:53 +0100 |
| commit | e18891b3d8980445d54528bd6653403385c0671c (patch) | |
| tree | 3fb2481442ae344d8b33e81dd011627f464552a4 /.gitignore | |
| parent | 3b524734a29824986ce0344e06cb81527cd266d8 (diff) | |
| parent | 9bdf1616c6f1360658c7a97c0d7e681a932b4ee7 (diff) | |
| download | libuca-e18891b3d8980445d54528bd6653403385c0671c.tar.gz libuca-e18891b3d8980445d54528bd6653403385c0671c.tar.bz2 libuca-e18891b3d8980445d54528bd6653403385c0671c.tar.xz libuca-e18891b3d8980445d54528bd6653403385c0671c.zip | |
Merge branch 'dexela'
Conflicts:
plugins/dexela/CMakeLists.txt
src/CMakeLists.txt
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions