diff options
| author | Treeve Jelbert | 2016-06-20 20:48:50 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2016-06-22 16:36:01 +0200 |
| commit | 0351965672dce93543ce2ac19820ec23dbeb1586 (patch) | |
| tree | 6009a437511530b020fdca9454034fd506f0cbaa | |
| parent | f3e67a8dc4431dfc2573366b54a72d3a884b3fad (diff) | |
qtwebkit - tweak
| -rwxr-xr-x | qt5-deprecated/qtwebkit/CONFLICTS | 1 | ||||
| -rw-r--r-- | qt5-deprecated/qtwebkit/HISTORY | 4 | ||||
| -rw-r--r-- | qt5-deprecated/qtwebkit/PROVIDES | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/qt5-deprecated/qtwebkit/CONFLICTS b/qt5-deprecated/qtwebkit/CONFLICTS index 38420f68ae..ebf43d2e7a 100755 --- a/qt5-deprecated/qtwebkit/CONFLICTS +++ b/qt5-deprecated/qtwebkit/CONFLICTS @@ -1 +1,2 @@ conflicts qtwebkit y +conflicts webkitqt diff --git a/qt5-deprecated/qtwebkit/HISTORY b/qt5-deprecated/qtwebkit/HISTORY index 530e20bce1..ed8ae50eb5 100644 --- a/qt5-deprecated/qtwebkit/HISTORY +++ b/qt5-deprecated/qtwebkit/HISTORY @@ -1,3 +1,7 @@ +2016-06-20 Treeve Jelbert <treeve@sourcemage.org> + * PROVIDES: added + * CONFLICTS: add future webkitqt + 2016-06-16 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.7.0 diff --git a/qt5-deprecated/qtwebkit/PROVIDES b/qt5-deprecated/qtwebkit/PROVIDES new file mode 100644 index 0000000000..9473416dce --- /dev/null +++ b/qt5-deprecated/qtwebkit/PROVIDES @@ -0,0 +1 @@ +WEBKIT_QT |