Difference between revisions of "Lazarus 1.0 fixes branch"

From Lazarus wiki
(How to merge)
(How to merge: no initialization in necessary)
Line 19: Line 19:
 
The lazarus developers have decided to use the native svn merge for this branch. Other branches used the svnmerge.py script to manage the revisions to be merged.
 
The lazarus developers have decided to use the native svn merge for this branch. Other branches used the svnmerge.py script to manage the revisions to be merged.
  
* TODO: write how to initialize branch for merging
 
 
* TODO: write down how to merge a set of revisions  
 
* TODO: write down how to merge a set of revisions  
  

Revision as of 14:26, 2 April 2012

This page contains the revisions to be merged from trunk to the Lazarus 1.0 fixes branch.
Release notes can be found here Release notes

Fixes for 1.0.0

Submitted by developer / committer

  • r36506 LazReport, fix barcode dialog localization (Jesus)
  • r36508 Updated Japanese translation
  • r36509 Window Column, store pointer to resourcestring
  • r36510 LazReport, fix barcode addin when TfrBarCodeObject is not yet instantiated (in this case barcode editor defaults to memo view.
  • r36511 DividerBevel: implemented Transparent.
  • r36514 IDE: moved macros save/saveall to source editor
  • r36515 IDE: update macro descriptions after translating resource strings
  • r36516 IDE: trim TLazPackageGraph.GetFallbackOutputDir
  • r36517 IDE: check if package needs rebuild: switch to fall back directory: update compiler params
  • r36518 IDE: install/uninstall package dialog: fixed icons, added info about current state

How to merge

The lazarus developers have decided to use the native svn merge for this branch. Other branches used the svnmerge.py script to manage the revisions to be merged.

  • TODO: write down how to merge a set of revisions

Maybe this information should be put in a separate page.

SVN_Migration#Merge_with_plain_svn