Merge authors:
Lars Helge Øverland (larshelge)
···
------------------------------------------------------------
revno: 1801 [merge]
committer: Jan Henrik Øverland <janhov@janhov>
branch nick: gis
timestamp: Thu 2010-04-22 17:17:23 +0200
message:
Merged with trunk.
removed:
dhis-2/dhis-i18n/
dhis-2/dhis-i18n/dhis-i18n-upgrader/
dhis-2/dhis-i18n/dhis-i18n-upgrader/pom.xml
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/java/
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/java/org/
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/java/org/hisp/
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/java/org/hisp/dhis/
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/java/org/hisp/dhis/i18n/
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/java/org/hisp/dhis/i18n/I18nUpgrader.java
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/resources/
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/resources/META-INF/
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/resources/META-INF/dhis/
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-i18n/dhis-i18n-upgrader/src/test/
dhis-2/dhis-i18n/pom.xml
added:
dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/I18nUpgrader.java
renamed:
dhis-2/dhis-i18n/dhis-i18n-db/ => dhis-2/dhis-support/dhis-support-i18n/
dhis-2/dhis-i18n/dhis-i18n-static/ => dhis-2/dhis-services/dhis-service-i18n/
modified:
dhis-2/dhis-services/dhis-service-core/pom.xml
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java
dhis-2/dhis-services/dhis-service-i18n/pom.xml
dhis-2/dhis-services/dhis-service-i18n/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/pom.xml
dhis-2/dhis-support/dhis-support-i18n/pom.xml
dhis-2/dhis-support/pom.xml
dhis-2/dhis-web/dhis-web-commons/pom.xml
dhis-2/pom.xml
The size of the diff (1229 lines) is larger than your specified limit of 1000 lines
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress