diff options
| author | Treeve Jelbert | 2020-11-02 10:43:42 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2020-11-02 10:43:42 +0100 |
| commit | c0e339c924fb193c8dc172709dac401124e6f226 (patch) | |
| tree | c46ec15c5bb514f00865dba5a764c7e127b50ff5 /qt5 | |
| parent | 5069714e7dd0c78f04108c56bd580a0ba66d1971 (diff) | |
qtwebengine - delete CONFLICTS
Diffstat (limited to 'qt5')
| -rwxr-xr-x | qt5/qtwebengine/CONFLICTS | 2 | ||||
| -rw-r--r-- | qt5/qtwebengine/HISTORY | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qt5/qtwebengine/CONFLICTS b/qt5/qtwebengine/CONFLICTS deleted file mode 100755 index b4e09db838..0000000000 --- a/qt5/qtwebengine/CONFLICTS +++ /dev/null @@ -1,2 +0,0 @@ -conflicts qtwebengine y -conflicts minizip y diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY index 95c1397703..d46b1807da 100644 --- a/qt5/qtwebengine/HISTORY +++ b/qt5/qtwebengine/HISTORY @@ -1,3 +1,6 @@ +2020-11-02 Treeve Jelbert <treeve@sourcemage.org> + * CONLICTS: deleted + 2020-09-30 Thomas Orgis <sobukus@sourcemage.org> * BUILD: Instead of trying to remove our flags, try to at least pick up -Os for the build. |