| 1 |
commit: 8367bc4c903be95b325ccfad51f4909666fe415d |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 4 15:51:23 2014 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 4 15:51:23 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8367bc4c |
| 7 |
|
| 8 |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde |
| 9 |
Manually resolve conflicts in package.mask since the 4.12.2 mask was removed in the meantime |
| 10 |
Conflicts: |
| 11 |
profiles/package.mask |
| 12 |
profiles/package.mask.d/kde-4.12.2 |
| 13 |
|
| 14 |
|
| 15 |
net-libs/libbluedevil/Manifest | 1 - |
| 16 |
net-libs/libbluedevil/libbluedevil-2.0_rc1.ebuild | 21 -- |
| 17 |
net-wireless/bluedevil/Manifest | 1 - |
| 18 |
net-wireless/bluedevil/bluedevil-2.0_rc1.ebuild | 31 --- |
| 19 |
profiles/package.mask | 264 ---------------------- |
| 20 |
profiles/package.mask.d/kde-4.12.2 | 263 --------------------- |
| 21 |
6 files changed, 581 deletions(-) |
Archives