Difference between revisions of "Lazarus 1.0 fixes branch"

From Free Pascal wiki
Jump to navigationJump to search
Line 6: Line 6:
 
==== Submitted by developer / committer ====
 
==== Submitted by developer / committer ====
 
*r36506 LazReport, fix barcode dialog localization (Jesus)
 
*r36506 LazReport, fix barcode dialog localization (Jesus)
 +
*r36508 Updated Japanese translation
  
 
== How to merge ==
 
== How to merge ==

Revision as of 23:30, 1 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

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.