Viewing all changes in revision 0.101.22.
- Committer: John H. Embretsen
- Date: 2010-03-05 09:05:46 UTC
- mfrom: (0.99.29 ooops)
- mto: (0.67.380 merge)
- mto: This revision was merged to the branch mainline in revision 2435.
- Revision ID: john.embretsen@sun.com-20100305090546-ca47gdh7vzh4ta10
Merge from lp:randgen, revno 376.
Manually resolved 3 conflicts:
Text conflict in lib/GenTest.pm
Text conflict in lib/GenTest/XML/Report.pm
Text conflict in lib/GenTest/XML/Test.pm
Kept changes in target branch while merging in
the change from xml_timestamp() to isoUTCTimestamp()
wherever xml_timestamp was used.
Manually resolved 3 conflicts:
Text conflict in lib/GenTest.pm
Text conflict in lib/GenTest/XML/Report.pm
Text conflict in lib/GenTest/XML/Test.pm
Kept changes in target branch while merging in
the change from xml_timestamp() to isoUTCTimestamp()
wherever xml_timestamp was used.
- files added:
- conf/optimizer/optimizer_access_exp.yy
- files modified:
- lib/GenTest.pm
expand all
collapse all
added
removed
