there is no next merge :) all 1.2 merges are done. Please merge this onto the trunk_1.2.x if did not already
On Dec 5, 2007 12:13 PM, Simon Lessard <[EMAIL PROTECTED]> wrote: > oups, yeah, I didn't mean to commit the 1.2 code as well, brain fart on my > side, it should have been added with the next merge (it should not cause a > merge conflict at least so no need to revert) > > > > On Dec 5, 2007 2:03 PM, Matthias Wessendorf <[EMAIL PROTECTED]> wrote: > > this fix is to late; > > the release vote is already out. > > And for a demo, I am not doing an "undo". > > > > -M > > > > On Dec 5, 2007 7:49 PM, <[EMAIL PROTECTED]> wrote: > > > Author: slessard > > > Date: Wed Dec 5 10:49:39 2007 > > > New Revision: 601466 > > > > > > URL: http://svn.apache.org/viewvc?rev=601466&view=rev > > > Log: > > > Fix in the demo's context parameter name for disabled content > compression. > > > > > > Modified: > > > > myfaces/trinidad/branches/1.2.4-branch/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml > > > > > > Modified: > myfaces/trinidad/branches/1.2.4-branch/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml > > > URL: > http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.4-branch/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml?rev=601466&r1=601465&r2=601466&view=diff > > > > ============================================================================== > > > --- > myfaces/trinidad/branches/1.2.4-branch/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml > (original) > > > +++ > myfaces/trinidad/branches/1.2.4-branch/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml > Wed Dec 5 10:49:39 2007 > > > @@ -63,7 +63,7 @@ > > > </context-param> > > > <!-- Uncomment this if you are debugging skinning and want the > styleclasses to not be compressed > > > <context-param> > > > - <param-name> > org.apache.myfaces.trinidadinternal.DISABLE_CONTENT_COMPRESSION</param-name> > > > + > <param-name>org.apache.myfaces.trinidad.DISABLE_CONTENT_COMPRESSION</param-name> > > > <param-value>true</param-value> > > > </context-param> > > > --> > > > > > > > > > > > > > > > > > -- > > Matthias Wessendorf > > > > further stuff: > > blog: http://matthiaswessendorf.wordpress.com/ > > sessions: http://www.slideshare.net/mwessendorf > > mail: matzew-at-apache-dot-org > > > >
