Merge authors: Jan Henrik Øverland (janhenrik-overland) Lars <larsh...@larshelg-laptop> ------------------------------------------------------------ revno: 1740 [merge] committer: Jan Henrik Overland <[email protected]> branch nick: trunk timestamp: Wed 2010-04-07 12:21:57 +0200 message: 2.0.4 release branch merged with trunk. removed: dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DownloadFileAction.java added: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/color_swatch2.png dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/excel.gif dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/image.png dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/grid-split.png modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegend.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegendSet.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/StreamUtils.java dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/color_swatch.png dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/export/SVGDocument.java dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/export/SVGUtils.java dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapView.vm 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/index.html 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/mapfish/widgets/geostat/Choropleth.js The size of the diff (2150 lines) is larger than your specified limit of 1000 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
