Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 03BF3200C46 for ; Wed, 15 Mar 2017 05:05:54 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 00E9C160B8C; Wed, 15 Mar 2017 04:05:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 20E84160B8F for ; Wed, 15 Mar 2017 05:05:52 +0100 (CET) Received: (qmail 27357 invoked by uid 500); 15 Mar 2017 04:05:52 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 25969 invoked by uid 99); 15 Mar 2017 04:05:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Mar 2017 04:05:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5E36BDF999; Wed, 15 Mar 2017 04:05:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmclean@apache.org To: commits@flex.apache.org Date: Wed, 15 Mar 2017 04:05:58 -0000 Message-Id: <798d18900db2495fa05adbad15d84dac@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/50] [abbrv] git commit: [flex-sdk] [refs/heads/master] - Merge branch 'develop' into release4.16.0 archived-at: Wed, 15 Mar 2017 04:05:54 -0000 Merge branch 'develop' into release4.16.0 Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/13183954 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/13183954 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/13183954 Branch: refs/heads/master Commit: 13183954ec08c2c58d5e16b0067e352f0084e768 Parents: b7ea704 286a0ca Author: Mihai Chira Authored: Wed Nov 9 14:24:15 2016 +0100 Committer: Mihai Chira Committed: Wed Nov 9 14:24:15 2016 +0100 ---------------------------------------------------------------------- .../src/mx/collections/GroupingCollection.as | 2 +- .../src/mx/collections/GroupingCollection2.as | 2 +- .../src/mx/olap/DefaultCubeImpl.as | 6 ++-- .../src/spark/components/MobileGrid.as | 5 ++-- .../supportClasses/MobileGridColumn.as | 6 ++-- .../framework/src/mx/collections/ISortField.as | 31 +++++++++++++++++++- .../framework/src/mx/collections/SortField.as | 16 +++++----- .../framework/tests/FLEX_34852_Tests.as | 5 ++-- .../ListCollectionView_FLEX_34837_Tests.as | 4 +-- .../projects/mx/src/mx/controls/DataGrid.as | 15 ++++++---- .../spark/src/spark/collections/SortField.as | 9 +++--- .../spark/src/spark/components/DataGrid.as | 3 +- .../spark/components/gridClasses/GridColumn.as | 6 ++-- .../SWFs/GridSortPreserveSelection.mxml | 5 ++-- .../Sort/SWFs/SF_ORIG_DataGridApp.mxml | 10 +++---- .../Sort/SWFs/SF_ORIG_DataGridApp_halo.mxml | 8 ++--- .../CustComp_sortField_compareFunction.mxml | 5 ++-- 17 files changed, 84 insertions(+), 54 deletions(-) ----------------------------------------------------------------------