Merge authors: Bharath (chbharathk) Mithilesh Kumar Thakur (mithilesh-hisp) ------------------------------------------------------------ revno: 1941 [merge] committer: Jo Størset <[email protected]> branch nick: cbhis-mobile timestamp: Fri 2010-10-22 12:19:29 +0530 message: Merge trunk r2008 removed: local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/javascript/ local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/takeMysqlBackupForm.vm added: local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/images/ local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/images/ajax-loader.gif local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/images/download-icon.jpg modified: local/in/dhis-web-maintenance-in/pom.xml local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/StreamMySqlBackupAction.java local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/TakeMySqlBackupAction.java local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/configurationForm.vm local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/menu.vm local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/takeMysqlBackupResult.vm local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/welcome.vm local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/GenerateAggregationReportAnalyserResultAction.java local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/javascript/reports.js The size of the diff (7803 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
