diff options
| author | Ladislav Hagara | 2012-02-28 23:32:46 +0100 |
|---|---|---|
| committer | Ladislav Hagara | 2012-02-28 23:32:46 +0100 |
| commit | bf1514537c6bf69d943b9ad5fb2ddb344aacd97b (patch) | |
| tree | 7168fefe0f99c4b235ef9ea6e6e7c06e0d5c3674 | |
| parent | e2dd72441b8fd433c7d777ab2ae6b33f4307cecf (diff) | |
cmake: CONFLICTS removed
| -rwxr-xr-x | devel/cmake/CONFLICTS | 1 | ||||
| -rw-r--r-- | devel/cmake/HISTORY | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/devel/cmake/CONFLICTS b/devel/cmake/CONFLICTS deleted file mode 100755 index 9761cb5bcc..0000000000 --- a/devel/cmake/CONFLICTS +++ /dev/null @@ -1 +0,0 @@ -conflicts colormake diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY index c478fb49fe..4d59f05c89 100644 --- a/devel/cmake/HISTORY +++ b/devel/cmake/HISTORY @@ -1,3 +1,6 @@ +2012-02-28 Ladislav Hagara <hgr@vabo.cz> + * CONFLICTS: removed, colormake now install colormake not cmake + 2012-02-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * BUILD: activated parallel bootstrap |