Changeset 239


Ignore:
Timestamp:
03/22/09 14:27:27 (9 years ago)
Author:
elemoine
Message:

svn merge -r189:HEAD http://www.geoext.org/svn/geoext/core/trunk ./

Location:
sandbox/elemoine/playground
Files:
8 added
2 edited
2 copied

Legend:

Unmodified
Added
Removed
  • sandbox/elemoine/playground/lib/GeoExt.js

    r207 r239  
    1 /*
    2  * Copyright (C) 2008 Eric Lemoine, Camptocamp France SAS
    3  *
    4  * This file is part of GeoExt
    5  *
    6  * GeoExt is free software: you can redistribute it and/or modify
    7  * it under the terms of the GNU General Public License as published by
    8  * the Free Software Foundation, either version 3 of the License, or
    9  * (at your option) any later version.
    10  *
    11  * GeoExt is distributed in the hope that it will be useful,
    12  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    13  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    14  * GNU General Public License for more details.
    15  *
    16  * You should have received a copy of the GNU General Public License
    17  * along with GeoExt.  If not, see <http://www.gnu.org/licenses/>.
    18  */
     1/* Copyright (C) 2008-2009 The Open Source Geospatial Foundation ¹
     2 * Published under the BSD license.
     3 * See http://geoext.org/svn/geoext/core/trunk/license.txt for the full text
     4 * of the license.
     5 *
     6 * ¹ pending approval */
    197
    208/*
     
    2513 * full text of the license.
    2614 */
    27 
    28 /*
    29  */
    30 
     15 
    3116(function() {
    3217
     
    7661            "GeoExt/data/FeatureReader.js",
    7762            "GeoExt/data/FeatureStore.js",
     63            "GeoExt/data/LayerStore.js",
     64            "GeoExt/data/LayerRecord.js",
    7865            "GeoExt/data/FeatureStoreMediator.js",
    7966            "GeoExt/data/RecordLayerMediator.js",
    8067            "GeoExt/data/LayerStoreMediator.js",
    81             "GeoExt/data/ProtocolProxy.js"
     68            "GeoExt/data/ProtocolProxy.js",
     69            "GeoExt/widgets/MapPanel.js"
    8270        );
    8371
  • sandbox/elemoine/playground/tests/list-tests.html

    r190 r239  
    33  <li>data/FeatureStore.html</li>
    44  <li>data/FeatureStoreMediator.html</li>
     5  <li>data/LayerRecord.html</li>
     6  <li>data/LayerStore.html</li>
    57  <li>data/LayerStoreMediator.html</li>
    68  <li>data/ProtocolProxy.html</li>
     9  <li>widgets/MapPanel.html</li>
    710</ul>
Note: See TracChangeset for help on using the changeset viewer.