v4-dev branch.
Resolved conflicts as follows:
* Src/Help/HTML/dlg_configcompilers.htm: added reference to Delphi XE2 to v4-dev version of document.
* Missing Src/UIniDataReader.pas: manually added changes to equivalent v4-dev file Src/DBIO.UIniDataReader.pas.
* Src/VCodeSnip.vi: kept version in v4-dev unchanged.
Some files are physically unchanged and have changes only to their
svn:mergeinfo property.