[ecf-build] 3.4Daily2.1 build.136 Build Fixed

[tedkubaska@xxxxxxxxxxx]

View results here -> http://ecf2.osuosl.org/logundercon.php?log=log20081115161224Lbuild.136

BUILD COMPLETE -  build.136
Date of build:	11/15/2008 16:12:24
Time to build:	9 minutes 44 seconds

 Errors/Warnings: (20)

Click on the results link to get copies of the latest Daily builds

-------------- cc-build.xml --------------

build.environment.properties: javacFailOnError = true

build.environment.properties:     buildingOSGi = true

build.environment.properties:     eclipse.home = /opt/eclipse3.4.1/eclipse

cc-build.xml                           logfile = logs/ecf.core-P21v20081115-1612.log

buildIdentifier:                                 DAILY

buildId:                                         v20081115-1612-DAILY

buildType:                                       P21

mapVTag:                                         Release_2_1

mapVersionTag:                                   p2_workaround_1

cctimestamp:                       timestamp = 20081115161224

-------------------------------------------------------------------

forceContextQualifier:         forceContextQualifier = v20081115-1612

cc-build.xml:                       buildResult = 0

cctimestamp:                       timestamp = 20081115161224

rcsmerge: warning: conflicts during merge

cvs commit: file `www/ecf/filelist21.txt' had a conflict and has not been modified

cvs [commit aborted]: correct above errors first!

 Unit Tests: (0)

No Tests Run

This project doesn't have any tests

 Modifications since last successful build:  (0)