summaryrefslogtreecommitdiffstats
path: root/build/bin/mergetool.py
Commit message (Collapse)AuthorAgeFilesLines
* Removed scripts no longer relevant for Vaadin 7/GitArtur Signell2012-10-251-704/+0
| | | | Change-Id: I01bc811775d654fdba38eba8c3d0507c22e0f7f1
* Removed svn:executable property to avoid problems with Git on WindowsArtur Signell2011-11-081-0/+0
| | | | svn changeset:21944/svn branch:6.7
* Merge tool bug fix.Marko Grönroos2010-03-011-1/+1
| | | | svn changeset:11562/svn branch:6.3
* Merged all 5.4 build script and testing tools related changes to 6.0Artur Signell2009-04-201-7/+4
| | | | svn changeset:7462/svn branch:6.0
* Fixed a subversion 1.5 compatibility problem in merge tool.Marko Grönroos2009-04-071-8/+7
| | | | svn changeset:7350/svn branch:6.0
* Fixed change list parsing problem in merge tool.Marko Grönroos2009-03-311-0/+4
| | | | svn changeset:7252/svn branch:6.0
* Merge from 5.3 to 6.0:Henri Sara2009-03-251-7/+29
| | | | | | | | | [7128] Fixes to merge tool. [7129] Merge from branches/manual_2009_03 to versions/5.3 (multiple changesets) [7131] Fixed language problems in the section on layout cell spacing. [7132] Use 24 hour format instead of 12 hour for Eclipse Manual plugin timestamp. svn changeset:7169/svn branch:6.0
* Merge from 5.3 to 6.0:Henri Sara2009-03-251-0/+682
[7015] Updated browser support list in Release Notes. For #2538. [7028] Merge from branches/release/5.3.0 to versions/5.3 (multiple changesets concerning build) [7039] Updated tutorial PDF, also added the header logo element. svn changeset:7166/svn branch:6.0