[xstream-scm] [2286] branches/v-1.4.x: Merge link to StudyTrails from trunk.

[joehni]

Title: [2286] branches/v-1.4.x: Merge link to StudyTrails from trunk.

Revision

2286

Author

joehni

Date

2014-05-31 11:17:06 -0500 (Sat, 31 May 2014)

Log Message

Merge link to StudyTrails from trunk.

Modified Paths

• branches/v-1.4.x/xstream-distribution/src/content/website.xml

Property Changed

branches/v-1.4.x/

Diff

Property changes: branches/v-1.4.x

Modified: svn:mergeinfo

+ /trunk:2151-2152,2154-2156,2158-2163,2165,2172,2175,2177,2188-2189,2197,2199-2201,2204,2206,2210,2212,2214-2217,2226,2229,2231,2233-2234,2236-2238,2247-2249,2279-2280,2285

Modified: branches/v-1.4.x/xstream-distribution/src/content/website.xml (2285 => 2286)

--- branches/v-1.4.x/xstream-distribution/src/content/website.xml	2014-05-31 16:15:18 UTC (rev 2285)
+++ branches/v-1.4.x/xstream-distribution/src/content/website.xml	2014-05-31 16:17:06 UTC (rev 2286)
@@ -1,6 +1,6 @@
 <!--
  Copyright (C) 2005, 2006 Joe Walnes.
- Copyright (C) 2006, 2007, 2010, 2011 XStream committers.
+ Copyright (C) 2006, 2007, 2010, 2011, 2014 XStream committers.
  All rights reserved.
  
  The software in this package is published under the terms of the BSD
@@ -52,6 +52,7 @@
         <page>objectstream.html</page>
         <page>persistence-tutorial.html</page>
         <page>json-tutorial.html</page>
+        <link title="StudyTrails">http://www.studytrails.com/java/xml/xstream/xstream-introduction.jsp</link>
     </section>
     <section>
         <name>Developing XStream</name>

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email