Merge authors: Jan Henrik Øverland (janhenrik-overland) ------------------------------------------------------------ revno: 2950 [merge] committer: Jan Henrik Overland <[email protected]> branch nick: dhis2 timestamp: Tue 2011-03-01 13:54:40 +0100 message: OpenLayers ux minified + GeoExt samples removed. removed: dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/data/ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/data/summits.json dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/data/wmscap.xml dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/feature-grid.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/feature-grid.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/layercontainer.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/layercontainer.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/legendpanel.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/legendpanel.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/mappanel-div.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/mappanel-div.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/mappanel-viewport.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/mappanel-viewport.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/mappanel-window.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/mappanel-window.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/popup.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/popup.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/search-form.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/search-form.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/toolbar.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/toolbar.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/tree.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/tree.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/wms-capabilities.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/wms-capabilities.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/zoom-chooser.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/zoom-chooser.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/zoomslider.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/geoext/examples/zoomslider.js modified: dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-ux/newSelectFeature.js The size of the diff (6738 lines) is larger than your specified limit of 5000 lines
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription _______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
