diff options
| author | Mihael Koep <koep@schneide.com> | 2012-10-19 16:08:05 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-10-19 16:08:05 +0200 |
| commit | 420839db21e0bb60f6be72f1924af74b0ffe8224 (patch) | |
| tree | 92b5d777f2d52d46da92b9e3793eab05d13f7d4f /docs/gen-changelog | |
| parent | b73c7a9550a39566b881244d95cd0cb2a97e82b3 (diff) | |
| parent | ee6b7a941f7ef7cdcc92c04b80a683d7370f52bd (diff) | |
| download | uca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.gz uca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.bz2 uca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.xz uca-420839db21e0bb60f6be72f1924af74b0ffe8224.zip | |
Merge remote branch 'origin/1.0' into dexela
Conflicts:
CMakeLists.txt
Diffstat (limited to 'docs/gen-changelog')
0 files changed, 0 insertions, 0 deletions