| commit | 9b02056ad92c82a68363dbf16679204a6f3839c4 | |
| author | Ondrej Sukup <mimi.vx@gmail.com> | |
| Tue, 22 Dec 2009 19:00:44 +0000 (22 20:00 +0100) | ||
| committer | Ondrej Sukup <mimi.vx@gmail.com> | |
| Tue, 22 Dec 2009 19:00:44 +0000 (22 20:00 +0100) | ||
| tree | 462d9ebbbce343363068f44a7b9231bb132e5e5a | treesnapshot (tar.gz zip) |
| parent | 717f41ffb9ab1cf339e7392105a888863fd54c6f | commitdiff |
| parent | 278d914c98b88310f86b4c8b4eb13cf7452b97f5 | commitdiff |
Merge branch 'devel' of ssh://repo.or.cz/srv/git/mimi_vx_overlay into devel
Conflicts:
sets/my_kdebase
Conflicts:
sets/my_kdebase
| sets/my_kdebase | diff1 | diff2 | blobhistory |