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:
5 deleted
2 edited
2 copied

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/web-app/css/main.css

    r883 r942  
    7676  height: 136px;
    7777}
     78#HeaderDemo {
     79  background: transparent url("../images/logoOnlineDemo.png") no-repeat scroll center;
     80  width: 980px;
     81  height: 136px;
     82}
    7883#HeaderLink{
    7984  display: block;
     
    693698.subnavigation li a:hover {
    694699    /*color: red;*/
    695     /*border-color: black;*/ 
     700    /*border-color: black;*/
    696701    border-width: 1px 0;
    697702}
Note: See TracChangeset for help on using the changeset viewer.