diff options
| author | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2014-02-04 16:51:23 +0100 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2014-02-04 16:51:23 +0100 |
| commit | 8367bc4c903be95b325ccfad51f4909666fe415d (patch) | |
| tree | 9960e1147d0de7f3636039ea0c59c6301c48132f /eclass/cmake-utils.eclass | |
| parent | 8e89c4c74e0a0b045f556f70d5cfc106185e8543 (diff) | |
| parent | 1fa389f7fcca2adb6bf59e49f89e0af789235034 (diff) | |
| download | kde-8367bc4c903be95b325ccfad51f4909666fe415d.tar.gz kde-8367bc4c903be95b325ccfad51f4909666fe415d.tar.bz2 kde-8367bc4c903be95b325ccfad51f4909666fe415d.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde
Manually resolve conflicts in package.mask since the 4.12.2 mask was removed in the meantime
Conflicts:
profiles/package.mask
profiles/package.mask.d/kde-4.12.2
Diffstat (limited to 'eclass/cmake-utils.eclass')
0 files changed, 0 insertions, 0 deletions