Difference between revisions of "Lazarus 1.0 fixes branch"
From Lazarus wiki
Jump to navigationJump to search| Line 12: | Line 12: | ||
*r36514 IDE: moved macros save/saveall to source editor | *r36514 IDE: moved macros save/saveall to source editor | ||
*r36515 IDE: update macro descriptions after translating resource strings | *r36515 IDE: update macro descriptions after translating resource strings | ||
| + | *r36516 IDE: trim TLazPackageGraph.GetFallbackOutputDir | ||
== How to merge == | == How to merge == | ||
Revision as of 11:24, 2 April 2012
This page contains the revisions to be merged from trunk to the Lazarus 1.0 fixes branch.
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
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 how to initialize branch for merging
- TODO: write down how to merge a set of revisions
Maybe this information should be put in a separate page.
