This should have said: svn merge -r 1310:1313 http://svn.openlaszlo.org/openlaszlo/branches/legals
-Max [EMAIL PROTECTED] wrote: > Author: max > Date: 2006-07-12 23:42:13 -0400 (Wed, 12 Jul 2006) > New Revision: 1314 > > Modified: > openlaszlo/branches/legals-pr2/WEB-INF/lps/lfc/data/LzDataset.lzs > openlaszlo/branches/legals-pr2/demos/et/app.lzx > Log: > svn merge -r 1298:1308 http://svn.openlaszlo.org/openlaszlo/branches/legals > > Modified: openlaszlo/branches/legals-pr2/WEB-INF/lps/lfc/data/LzDataset.lzs > =================================================================== > --- openlaszlo/branches/legals-pr2/WEB-INF/lps/lfc/data/LzDataset.lzs > 2006-07-13 03:39:17 UTC (rev 1313) > +++ openlaszlo/branches/legals-pr2/WEB-INF/lps/lfc/data/LzDataset.lzs > 2006-07-13 03:42:13 UTC (rev 1314) > @@ -289,6 +289,7 @@ > this.setChildNodes( [data] ); > } > > + this.data = data; > > if (this.responseheaders != null) { > this.responseheaders.destroy(); > > Modified: openlaszlo/branches/legals-pr2/demos/et/app.lzx > =================================================================== > --- openlaszlo/branches/legals-pr2/demos/et/app.lzx 2006-07-13 03:39:17 UTC > (rev 1313) > +++ openlaszlo/branches/legals-pr2/demos/et/app.lzx 2006-07-13 03:42:13 UTC > (rev 1314) > @@ -547,7 +547,7 @@ > <!-- [TODO: change link and fix this comment ] load flash app in > place --> > <linkbutton label="Flash application" > width="500" > - url="http:app.lzx?lzt=html" > + url="http:app-loader.html?lzr=swf7&lzt=html" > targetframe="_top" > windowopts="" > /> > @@ -555,7 +555,7 @@ > <!-- [TODO: change link and fix this comment ] load dhtml app in > place --> > <linkbutton label="DHTML application" > width="500" > - url="http:app-dhtml.html" > + url="http:app-loader.html?lzr=dhtml&lzt=dhtml" > targetframe="_top" > windowopts="" > /> > > _______________________________________________ > Laszlo-checkins mailing list > [EMAIL PROTECTED] > http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins > _______________________________________________ Laszlo-dev mailing list [email protected] http://www.openlaszlo.org/mailman/listinfo/laszlo-dev
