#851 Merge ticket 821 into current trunk,

[nikhilgupta10]

Working from current trunk to incorporate changes from ticket 821.,

[nikhilgupta10]

nikhilgupta10 imported these comments from Sourceforge: The user laurmarinovici does not exist anymore. Therefore assigning this to afisher1. "dchassin":Branched from trunk and merged changes in ticket 821 ok. Validation on Linux ok. Committed change as r4754.,

"dchassin":Validate on Windows 32 and 64 ok.

Ready to validate and merge to branch/3.1.,

"dchassin":- status: new --> assigned

• assigned_to: Andy Fisher
• Milestone: 1.0 --> Version 3.1 RC1
• Resolution: none --> validate
• Component: none --> climate
• Priority: none --> critical

• Version: --> trunk ,

  "dchassin":This ticket replaces 821. Closing 821.,

  "andyfisher":- assigned_to: Andy Fisher --> Laurentiu Marinovici ,

  "laurmarinovici":- status: assigned --> closed ,

  "laurmarinovici":(3.1) Manually merged the changes in /climate/climate.cpp, /climate/csv_reader.cpp, /core/timestamp.c, /core/tzinfo.txt from tickets 821 and 851 into the corresponding files in 3.1. Tested and validated on both Win and Linux, 32 and 64 bit versions. Then merged into trunk as well. Closing ticket 851.,