| commit | f7c2f6f2bd33827c13862cb852d4908161c0d7b9 | |
| author | Ondrej Sukup <mimi.vx@gmail.com> | |
| Tue, 30 Mar 2010 17:26:15 +0000 (30 19:26 +0200) | ||
| committer | Ondrej Sukup <mimi.vx@gmail.com> | |
| Tue, 30 Mar 2010 17:26:15 +0000 (30 19:26 +0200) | ||
| tree | 4cd12f70159e8053105decb113277af988c6cb4a | treesnapshot (tar.gz zip) |
| parent | 1a2a6cc713c29583f6c97364b3585297e937a7db | commitdiff |
| parent | 1843ff59a1f54467c9c3c5e5262361ad368a24d6 | commitdiff |
Merge branch 'master' into devel
Conflicts:
sets/my_kdebase
sets/my_kdeother
Conflicts:
sets/my_kdebase
sets/my_kdeother