The merge of wafflecone to legals is done, with r6483. A few notes:

There were conflicts on these files -- Max, please review their current status to make sure they're what you expect:
lps/includes/source/embed-library.lzs
WEB-INF/lps/templates/app-console_jp.xslt
WEB-INF/lps/templates/app-console.xslt
lps/includes/source/embednew.js

r6464 was backed out, and will need to be re-applied.

"ant runlzunit" passes in current legals.

I'll do the rest of the svn management today and tomorrow... but for now: yes, you can check in to legals!

Do not check in to wafflecone! (Unless you're Mamye, changing the build.properties to "Final.")

-ben




Reply via email to