dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3399: Merging Code from 2.1 - work in progress

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Fri, 15 Apr 2011 11:44:29 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3399
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-04-15 17:10:14 +0530
message:
  Merging Code from 2.1 - work in progress
modified:
  local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-reports-national/src/main/resources/org/hisp/dhis/reports/i18n_module.properties
  local/in/dhis-web-reports-national/src/main/resources/struts.xml
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/addReportForm.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/aggregationReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/autoReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/csReviewReportFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/editReportForm.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/feedbackReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/javascript/reportManagement.js
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/javascript/reports.js
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menu.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForAutoReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/ouWiseProgressReportFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/periodWiseprogressReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/physicalReportform.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/routineReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/upwardReportAnalysisFront.vm
The size of the diff (6939 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