Ignore:
Timestamp:
3 Jul 2012, 17:48:46 (12 years ago)
Author:
uli
Message:

Merge changes from uli-autoinclude-less branch back into trunk.

Location:
main/waeup.uniben/trunk
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.uniben/trunk

    • Property svn:externals

      •  

        old new  
        11bootstrap svn://svn.zope.org/repos/main/zc.buildout/trunk/bootstrap/
        2 waeup.kofa https://svn.waeup.org/repos/main/waeup.kofa/trunk
        3 kofacustom.nigeria https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk
    • Property svn:mergeinfo changed
      /main/waeup.uniben/branches/uli-autoinclude-less (added)merged: 8878-8880,​8882

  • main/waeup.uniben/trunk/src/waeup/uniben/configure.zcml

    r8035 r8893  
    1 <configure xmlns="http://namespaces.zope.org/zope">
     1<configure xmlns="http://namespaces.zope.org/zope"
     2           xmlns:grok="http://namespaces.zope.org/grok">
     3  <include package="waeup.uniben" file="locales.zcml" />
    24
    3   <include package="waeup.uniben" file="locales.zcml" />
    4   <include package="grok" />
    5   <includeOverrides package="waeup.uniben" file="overrides.zcml" />
     5  <!-- kofacustom.nigeria configures everything we basically need.
     6  -->
     7  <include package="kofacustom.nigeria" />
     8
     9  <grok:grok package="." />
    610
    711</configure>

  • main/waeup.uniben/trunk/src/waeup/uniben/ftesting.zcml

    r8441 r8893  
    66   >
    77
    8   <include package="grok" />
    9   <includeOverrides package="waeup.uniben" />
    10   <includeOverrides package="waeup.uniben" file="mail.zcml"/>
     8  <include package="waeup.uniben" />
     9  <include package="waeup.uniben" file="mail.zcml"/>
    1110
    1211  <!-- Where should the datacenter reside by default? -->
Note: See TracChangeset for help on using the changeset viewer.