Ignore:
Timestamp:
May 22, 2011, 12:29:29 AM (13 years ago)
Author:
gav
Message:

Svn merge -r920:r941 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:
branches/features/purchaseOrders
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/features/purchaseOrders

    • Property svn:ignore

      •  

        old new  
        11*.log*
        22*.war
         3*.iml
         4*.ipr
         5*.iws
        36target
         7out
        48.directory
        5 
        6 *.iml
    • Property svn:mergeinfo changed
      /trunkmerged: 921-923,​932-936,​939-941

  • branches/features/purchaseOrders/grails-app/views/_about.gsp

    r521 r942  
    191191                </td>
    192192            </tr>
    193                 <tr>
    194                     <td>
    195                         Plugins: ${plugins}
    196                     </td>
    197                 </tr>
    198         </tbody>
    199     </table>
    200 </div>
     193            <tr>
     194                <td>
     195                    Plugins: ${plugins}
     196                </td>
     197            </tr>
     198            <tr>
     199                <td>
     200                    Java version: ${System.getProperty('java.version').encodeAsHTML()} (As supplied by host JVM) <br />
     201                    Groovy version: ${org.codehaus.groovy.runtime.InvokerHelper.getVersion()} (As supplied with Grails)
     202                </td>
     203            </tr>
     204        </tbody>
     205    </table>
     206</div>
Note: See TracChangeset for help on using the changeset viewer.