geirm       2003/08/10 13:09:52

  Log:
  Committing code from Jeremy and Dain
  
  Status:
  
  Vendor Tag:   asf
  Release Tags: import
  
  N incubator-geronimo/LICENSE.txt
  N incubator-geronimo/maven.xml
  N incubator-geronimo/project.properties
  N incubator-geronimo/project.xml
  C incubator-geronimo/PROPOSAL.txt
  N incubator-geronimo/README.txt
  N incubator-geronimo/xdocs/faq.fml
  N incubator-geronimo/xdocs/index.html
  N incubator-geronimo/xdocs/links.xml
  N incubator-geronimo/xdocs/navigation.xml
  N incubator-geronimo/xdocs/reuse.html
  
  1 conflicts created by this import.
  Use the following command to help the merge:
  
        cvs checkout -jasf:yesterday -jasf incubator-geronimo

Reply via email to