You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2017/01/08 04:48:45 UTC
[3/5] portals-pluto git commit: Merge branch 'fixtests' of
e:\git\pluto-git into fixtests
Merge branch 'fixtests' of e:\git\pluto-git into fixtests
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/1fa27854
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/1fa27854
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/1fa27854
Branch: refs/heads/master
Commit: 1fa278545168788ad3903177827779edfc6cf250
Parents: 7693427 cd97dfd
Author: Scott Nicklous <ms...@apache.org>
Authored: Sat Jan 7 13:29:20 2017 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Sat Jan 7 13:29:20 2017 +0100
----------------------------------------------------------------------
.../xml-resources/tck-TestModule3-pages.xml | 6 ++---
.../resources/xml-resources/additionalPages.xml | 28 ++++++++++----------
.../resources/xml-resources/additionalPages.xml | 20 +++++++-------
.../resources/xml-resources/additionalPages.xml | 12 ++++-----
.../resources/xml-resources/additionalPages.xml | 10 +++----
.../resources/xml-resources/additionalPages.xml | 26 +++++++++---------
.../resources/xml-resources/additionalPages.xml | 28 ++++++++++----------
.../resources/xml-resources/additionalPages.xml | 6 ++---
.../resources/xml-resources/additionalPages.xml | 4 +--
.../resources/xml-resources/additionalPages.xml | 22 +++++++--------
.../resources/xml-resources/additionalPages.xml | 8 +++---
.../resources/xml-resources/additionalPages.xml | 10 +++----
.../resources/xml-resources/additionalPages.xml | 6 ++---
.../resources/xml-resources/additionalPages.xml | 10 +++----
.../xml-resources/plutoPageCombiner.xsl | 2 +-
portlet-tck_3.0/pom.xml | 9 +++++--
16 files changed, 106 insertions(+), 101 deletions(-)
----------------------------------------------------------------------