Changeset 2616

Show
Ignore:
Timestamp:
03/04/11 21:44:45 (2 years ago)
Author:
ahocevar
Message:

Merge commit '6724831776e87aba2c8e4f184ba7d1817e7ae18b'

Conflicts:

lib/loader.js

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extensions/geoext.ux/ux/PrintPreview/lib/loader.js

    r1870 r2616  
    5353 
    5454    var jsfiles = new Array( 
    55         "GeoExt.ux/PrintPreview.js" 
     55        "GeoExt.ux/PrintPreview.js", 
     56        "GeoExt.ux/locale/ca.js", 
     57        "GeoExt.ux/locale/es.js" 
    5658    ); 
    5759