You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2014/04/19 00:37:20 UTC

[1/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/wicket

Repository: wicket
Updated Branches:
  refs/heads/master a6670a500 -> 1f22ddbec


Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/wicket


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fd7555d2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fd7555d2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fd7555d2

Branch: refs/heads/master
Commit: fd7555d2cff0ffcc3485f94f0195f5776f03121c
Parents: fe82a9d 33206b3
Author: Martijn Dashorst <da...@apache.org>
Authored: Sat Apr 19 00:35:42 2014 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sat Apr 19 00:37:04 2014 +0200

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/fd7555d2/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 5c1fee6,5c1fee6..0ed0efc
--- a/pom.xml
+++ b/pom.xml
@@@ -365,7 -365,7 +365,7 @@@
  				<type>jar</type>
  			</dependency>
  			<dependency>
--				<groupId>org.apache.wicket.experimental.wicket-7.x</groupId>
++				<groupId>org.apache.wicket.experimental.wicket7</groupId>
  				<artifactId>wicket-atmosphere</artifactId>
  				<version>0.10-SNAPSHOT</version>
  				<type>jar</type>


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/wicket

Posted by da...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/wicket


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1f22ddbe
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1f22ddbe
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1f22ddbe

Branch: refs/heads/master
Commit: 1f22ddbec1145ca8df03f82202cf055a2a451e4a
Parents: fd7555d a6670a5
Author: Martijn Dashorst <da...@apache.org>
Authored: Sat Apr 19 00:37:23 2014 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sat Apr 19 00:37:23 2014 +0200

----------------------------------------------------------------------

----------------------------------------------------------------------