Merge authors:
  Jan Henrik Ă˜verland (janhenrik-overland)
------------------------------------------------------------
revno: 2409 [merge]
committer: Jan Henrik Overland <[email protected]>
branch nick: trunk
timestamp: Thu 2010-10-21 18:29:57 +0200
message:
  (GIS) Improved code. New icons added.
removed:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite_star2.png
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help2.png
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/color_swatch.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/exit.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite_star.gif
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/image.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world.png
  
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/config.js
  
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/ext-ux/theme/gray-extend-ux/grid-split.png
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Choropleth.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Symbol.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
The size of the diff (3122 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

Reply via email to