Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
windows:mingw:win64
mingw64-kitemmodels
mingw64-kitemmodels.changes
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File mingw64-kitemmodels.changes of Package mingw64-kitemmodels
------------------------------------------------------------------- Tue Jul 2 10:10:53 UTC 2024 - Ralf Habacker <ralf.habacker@freenet.de> - Update to 5.103.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.103.0.php ------------------------------------------------------------------- Fri Jul 15 07:46:34 UTC 2022 - Ralf Habacker <ralf.habacker@freenet.de> - Update to 5.76.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.76.0.php ------------------------------------------------------------------- Sun Dec 8 11:18:40 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr> - Update to 5.65.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.65.0.php - Too many changes to list here. ------------------------------------------------------------------- Sun Nov 3 15:47:06 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr> - Update to 5.64.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.64.0.php - Changes since 5.63.0: * autotests: check that mapFromSource returns invalid for unmapped columns. * Use ECMGenerateExportHeader to manage deprecated API better ------------------------------------------------------------------- Sun Oct 6 13:26:42 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr> - Update to 5.63.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.63.0.php - Changes since 5.62.0: * Port away from deprecated methods since Qt 5.14 ------------------------------------------------------------------- Sat Sep 7 20:36:54 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr> - Update to 5.62.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.62.0.php - Changes since 5.61.0: * Add @since to properties * Add Q_PROPERTIES interface to KDescendantsProxyModel * Port away from deprecated methods in Qt * Port away from deprecated method QModelIndex::child() * Remove unused includes ------------------------------------------------------------------- Wed Aug 7 17:51:32 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr> - Update to 5.61.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.61.0.php - Changes since 5.60.0: * Write myself down as the maintainer for KItemModels * KConcatenateRowsProxyModel: add note that Qt 5.13 provides QConcatenateTablesProxyModel ------------------------------------------------------------------- Fri Jul 19 11:42:40 UTC 2019 - Wolfgang Bauer <wbauer@tmo.at> - Don't lower minimum Qt version anymore, it requires 5.11 now ------------------------------------------------------------------- Sun Jul 14 06:41:38 UTC 2019 - lbeltrame@kde.org - Update to 5.60.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.60.0.php - Changes since 5.59.0: * Install in new logging directory when we use kf5 5.59.0 ------------------------------------------------------------------- Sun Jun 09 07:35:12 UTC 2019 - lbeltrame@kde.org - Update to 5.59.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.59.0.php - No code changes since 5.58.0 ------------------------------------------------------------------- Wed May 15 18:16:17 UTC 2019 - lbeltrame@kde.org - Update to 5.58.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.58.0.php - No code changes since 5.57.0 ------------------------------------------------------------------- Sun Apr 14 20:21:43 UTC 2019 - lbeltrame@kde.org - Update to 5.57.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.57.0.php - Changes since 5.56.0: * [kitemmodels] make it compile without foreach * Port deprecated qSort ------------------------------------------------------------------- Sun Mar 10 20:15:36 UTC 2019 - lbeltrame@kde.org - Update to 5.56.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.56.0.php - Changes since 5.55.0: * Fix example in documentation * KRearrangeColumnsProxyModel: make the two column-mapping methods public ------------------------------------------------------------------- Fri Feb 15 09:25:42 UTC 2019 - alarrosa@suse.com - Downgrade the Qt version requirement to build with 5.9 ------------------------------------------------------------------- Sun Feb 10 22:03:12 UTC 2019 - lbeltrame@kde.org - Update to 5.55.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.55.0.php - Changes since 5.54.0: * No code changes since 5.54.0 ------------------------------------------------------------------- Mon Jan 14 06:08:48 UTC 2019 - lbeltrame@kde.org - Update to 5.54.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.54.0.php - Changes since 5.53.0: * Remove code for qt < 4.7.2 :) ------------------------------------------------------------------- Sun Dec 09 19:43:44 UTC 2018 - lbeltrame@kde.org - Update to 5.53.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.53.0.php - Changes since 5.52.0: * autotests: remove testmodelqueuedconnections.cpp which asserts in Qt 5.11 * Use isEmpty() * Remove unused virtual keyword * Normalize signal/slot ------------------------------------------------------------------- Sun Nov 11 19:48:05 UTC 2018 - lbeltrame@kde.org - Update to 5.52.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.52.0.php - Changes since 5.51.0: * Add missing "emit" * Fix minor EBN issues and typos * USe new syntax ------------------------------------------------------------------- Tue Oct 16 08:02:21 UTC 2018 - Luca Beltrame <lbeltrame@kde.org> - Run spec-cleaner ------------------------------------------------------------------- Mon Oct 15 11:50:36 UTC 2018 - lbeltrame@kde.org - Update to 5.51.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.51.0.php - Changes since 5.50.0: * Remove misleading use of KDE_INSTALL_PYTHONBINDINGSDIR * Use reference in for loop for type with non-trivial copy constructor * Make sure to build with strict compile flags + port to no deprecated method ------------------------------------------------------------------- Thu Sep 13 21:58:45 UTC 2018 - lbeltrame@kde.org - Update to 5.50.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.50.0.php - Changes since 5.49.0: * None ------------------------------------------------------------------- Sun Aug 19 09:19:13 UTC 2018 - christophe@krop.fr - Update to 5.49.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.49.0.php - Changes since 5.48.0: * None ------------------------------------------------------------------- Mon Jul 16 04:37:41 UTC 2018 - lbeltrame@kde.org - Update to 5.48.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.48.0.php - Changes since 5.47.0: * None ------------------------------------------------------------------- Tue Jun 12 21:26:05 UTC 2018 - lbeltrame@kde.org - Update to 5.47.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.47.0.php - Changes since 5.46.0: * Properly sanitize input * Warning-- * Use override ------------------------------------------------------------------- Sun May 13 21:03:04 UTC 2018 - lbeltrame@kde.org - Update to 5.46.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.46.0.php - Changes since 5.45.0: * None ------------------------------------------------------------------- Sat Apr 14 13:19:04 CEST 2018 - lbeltrame@kde.org - Update to 5.45.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.45.0.php - Changes since 5.44.0: * Remove not necessary QtCore and co ------------------------------------------------------------------- Mon Mar 12 23:29:41 CET 2018 - lbeltrame@kde.org - Update to 5.44.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.44.0.php - Changes since 5.43.0: * None ------------------------------------------------------------------- Mon Feb 12 23:42:09 CET 2018 - lbeltrame@kde.org - Update to 5.43.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.43.0.php - Changes since 5.42.0: * KRearrangeColumnsProxyModel: fix crash when there's no source model * KRearrangeColumnsProxyModel: reimplement sibling() so it works as expected ------------------------------------------------------------------- Tue Jan 16 22:50:18 CET 2018 - lbeltrame@kde.org - Update to 5.42.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.42.0.php - Changes since 5.41.0: * Remove obsolete reviewboardrc file * test program: fix QLayout warning ------------------------------------------------------------------- Sun Dec 17 09:43:48 CET 2017 - lbeltrame@kde.org - Update to 5.41.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.41.0.php - Changes since 5.40.0: * Update comment for new Qt 5.10 API * Port to qCDebug ------------------------------------------------------------------- Mon Nov 13 07:01:14 CET 2017 - lbeltrame@kde.org - Update to 5.40.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.40.0.php - Changes since 5.39.0: * None ------------------------------------------------------------------- Mon Oct 23 06:41:41 CEST 2017 - lbeltrame@kde.org - Update to 5.39.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.39.0.php - Changes since 5.38.0: * None ------------------------------------------------------------------- Tue Sep 12 07:11:17 CEST 2017 - lbeltrame@kde.org - Update to 5.38.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.38.0.php - Changes since 5.37.0: * None ------------------------------------------------------------------- Sat Aug 12 09:23:31 UTC 2017 - christophe@krop.fr - Update to 5.37.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.37.0.php - Changes since 5.36.0 : * Use more nullptr ------------------------------------------------------------------- Wed Jul 12 07:14:01 CEST 2017 - lbeltrame@kde.org - Update to 5.36.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.36.0.php - Changes since 5.35.0: * [FEATURE] Option to build & install QCH file with the public API dox ------------------------------------------------------------------- Sun Jun 11 09:27:43 CEST 2017 - lbeltrame@kde.org - Update to 5.35.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.35.0.php - Changes since 5.34.0: * Use explicit flags constructor instead of confusing nullptr * Update link from websvn.kde.org to commits.kde.org * API dox: note CamelCase includes by @class tag with more classes ------------------------------------------------------------------- Mon May 15 13:53:13 CEST 2017 - fabian@ritter-vogt.de - Update to 5.34.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.34.0.php - Changes since 5.33.0: * None ------------------------------------------------------------------- Sat Apr 15 10:11:51 CEST 2017 - lbeltrame@kde.org - Update to 5.33.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.33.0.php - Changes since 5.32.0: * Upgrade ECM and KF5 version requirements for 5.33.0 release. * Fix build with Qt branch 5.9 * Include file to integrate with phabricator * Mention the new QSFPM::setRecursiveFiltering(true) which makes KRecursiveFilterProxyModel obsolete. * KDescendantsProxyModel: fix typo in apidox * Upgrade KF5 version to 5.33.0. ------------------------------------------------------------------- Sun Mar 19 14:50:48 CET 2017 - lbeltrame@kde.org - Update to 5.32.0 * New feature release * For more details please see: * https://www.kde.org/announcements/kde-frameworks-5.32.0.php - Changes since 5.31.0: * Upgrade ECM and KF5 version requirements for 5.32.0 release. * Upgrade KF5 version to 5.32.0. ------------------------------------------------------------------- Thu Feb 9 09:30:45 UTC 2017 - hrvoje.senjan@gmail.com - Update to 5.31.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.31.0.php ------------------------------------------------------------------- Sun Jan 8 23:41:58 UTC 2017 - hrvoje.senjan@gmail.com - Update to 5.30.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.30.0.php ------------------------------------------------------------------- Sun Dec 4 02:00:48 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.29.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.29.0.php ------------------------------------------------------------------- Sat Nov 5 22:07:11 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.28.0 * Add python bindings * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.28.0.php ------------------------------------------------------------------- Sun Oct 2 12:56:35 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.27.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.27.0.php ------------------------------------------------------------------- Tue Sep 6 20:51:08 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.26.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.26.0.php ------------------------------------------------------------------- Sun Aug 7 21:54:21 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.25.0 * Qt >= 5.5 is now required * KRearrangeColumnsProxyModel: fix assert in index(0, 0) on empty model * Fix KDescendantsProxyModel::setSourceModel() not clearing internal caches * KRecursiveFilterProxyModel: fix QSFPM corruption due to filtering out rowsRemoved signal (kde#349789) * KExtraColumnsProxyModel: implement hasChildren() * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.25.0.php ------------------------------------------------------------------- Wed Jul 6 15:04:44 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.24.0 * Add KExtraColumnsProxyModel::removeExtraColumn, will be needed by StatisticsProxyModel * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.24.0.php ------------------------------------------------------------------- Mon Jun 6 21:26:10 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.23.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.23.0.php ------------------------------------------------------------------- Sat May 7 18:32:28 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.22.0 (boo#980066) * Fix template syntax for test case generation * Fix linking with Qt 5.4 (wrongly placed #endif) * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.22.0.php ------------------------------------------------------------------- Mon Apr 4 14:21:11 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.21.0 (boo#974793) * KSelectionProxyModel: Simplify row removal handling, simplify deselection logic * KSelectionProxyModel: Recreate mapping on removal only if needed (kde#352369) * KSelectionProxyModel: Only clear firstChild mappings for top-level * KSelectionProxyModel: Ensure proper signalling when removing last selected * Make DynamicTreeModel searchable by display role * Upgrade Qt version requirement to 5.4.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.21.0.php ------------------------------------------------------------------- Sun Mar 6 09:59:36 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.20.0 (boo#970856) * KLinkItemSelectionModel: Add new default constructor * KLinkItemSelectionModel: Make the linked selection model settable * KLinkItemSelectionModel: Handle changes to the selectionModel model * KLinkItemSelectionModel: Don't store model locally * KSelectionProxyModel: Fix iteration bug * Reset KSelectionProxyModel state when needed * Add a property indicating whether the models form a connected chain * KModelIndexProxyMapper: Simplify logic of connected check * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.20.0.php ------------------------------------------------------------------- Sat Feb 6 18:04:28 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.19.0 (boo#967668) * KRecursiveFilterProxyModel::match: Fix crash * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.19.0.php ------------------------------------------------------------------- Sat Jan 2 17:44:03 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.18.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.18.0.php ------------------------------------------------------------------- Thu Dec 10 23:07:35 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.17.0 * Fix KSelectionProxyModel usage in QTableView (kde#352369) * Fix resetting or changing the source model of a KRecursiveFilterProxyModel. * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.17.0.php ------------------------------------------------------------------- Sun Nov 8 17:02:07 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.16.0 (boo#955067) * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.16.0.php ------------------------------------------------------------------- Mon Oct 5 17:37:22 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.15.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.15.0.php ------------------------------------------------------------------- Tue Sep 8 17:13:15 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.14.0 * New proxymodel: KConcatenateRowsProxyModel * KConcatenateRowsProxyModelPrivate: fix handling of layoutChanged. * More checking on the selection after sorting. * KExtraColumnsProxyModel: fix bug in sibling() which broke e.g. selections * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.14.0.php ------------------------------------------------------------------- Tue Aug 4 19:20:32 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.13.0 * The Qt version requirement has been bumped from 5.2 to 5.3 * Debug output has been ported to categorized output, for less noise by default * Docbook documentation has been reviewed and updated * New proxy: KExtraColumnsProxyModel, allows to add columns to an existing model. * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.13.0.php ------------------------------------------------------------------- Sun Jul 5 18:45:12 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.12.0 * New proxy model: KRearrangeColumnsProxyModel. It supports reordering and hiding columns from the source model. * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.12.0.php ------------------------------------------------------------------- Sun Jun 7 19:07:43 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.11.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.11.0.php ------------------------------------------------------------------- Sun May 3 19:50:18 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.10.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.10.0.php ------------------------------------------------------------------- Sat Apr 4 14:40:59 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.9.0 * KRecursiveFilterProxyModel: reworked to emit the right signals at the right time * KDescendantsProxyModel: Handle moves reported by the source model. * KDescendantsProxyModel: Fix behavior when a selection is made while resetting. * KDescendantsProxyModel: Allow constructing and using KSelectionProxyModel from QML. * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.9.0.php ------------------------------------------------------------------- Sat Mar 7 16:58:59 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.8.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.8.0.php ------------------------------------------------------------------- Sun Feb 8 18:15:36 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.7.0 * Fixed KRecursiveFilterProxyModel for Qt 5.5.0+, due to QSortFilterProxyModel now using the roles parameter to the dataChanged signal * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.7.0.php ------------------------------------------------------------------- Sat Jan 3 18:03:32 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.6.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.6.0.php ------------------------------------------------------------------- Sat Dec 6 12:53:52 UTC 2014 - hrvoje.senjan@gmail.com - Update to 5.5.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.5.0.php ------------------------------------------------------------------- Sun Nov 2 17:47:49 UTC 2014 - hrvoje.senjan@gmail.com - Update to 5.4.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.4.0.php ------------------------------------------------------------------- Sat Oct 4 18:00:01 UTC 2014 - hrvoje.senjan@gmail.com - Update to 5.3.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.3.0.php ------------------------------------------------------------------- Tue Sep 9 09:49:39 UTC 2014 - hrvoje.senjan@gmail.com - Update to 5.2.0 * For more details please see: http://kde.org/announcements/kde-frameworks-5.2.php ------------------------------------------------------------------- Sat Aug 2 10:20:22 UTC 2014 - hrvoje.senjan@gmail.com - Update to 5.1.0 * For more details please see: http://www.kde.org/announcements/kde-frameworks-5.1.php - Harden required Qt5 libs versions ------------------------------------------------------------------- Tue Jul 1 21:36:10 UTC 2014 - hrvoje.senjan@gmail.com - Update to 5.0.0 * Final release of KDE Frameworks 5 * API improvements and cleanups * Buildsystem fixes * For more details please see: http://www.kde.org/announcements/kde-frameworks-5.0.php ------------------------------------------------------------------- Sun Jun 1 18:02:42 UTC 2014 - hrvoje.senjan@gmail.com - Update to 4.100.0 * API improvements and cleanups * Buildsystem fixes * For more details please see: http://www.kde.org/announcements/announce-frameworks5-beta3.php - Add baselibs.conf ------------------------------------------------------------------- Sun May 4 01:41:15 UTC 2014 - hrvoje.senjan@gmail.com - Update to 4.99.0 * API improvements and cleanups * Buildsystem fixes * For more details please see: http://www.kde.org/announcements/announce-frameworks5-beta2.php ------------------------------------------------------------------- Sat Mar 29 19:47:43 UTC 2014 - hrvoje.senjan@gmail.com - Update to 4.98.0 * API improvements and cleanups * Buildsystem fixes * For more details please see: http://www.kde.org/announcements/announce-frameworks5-beta1.php ------------------------------------------------------------------- Tue Mar 4 16:35:50 UTC 2014 - hrvoje.senjan@gmail.com - Update to 4.97.0: * Buildsystem fixes * For more details please see: http://www.kde.org/announcements/announce-frameworks5-alpha2.php ------------------------------------------------------------------- Sat Feb 8 02:18:59 UTC 2014 - hrvoje.senjan@gmail.com - Init kitemmodels package
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor