summaryrefslogtreecommitdiffstats
path: root/build/bin/mergetool.py
Commit message (Expand)AuthorAgeFilesLines
* Removed svn:executable property to avoid problems with Git on WindowsArtur Signell2011-11-081-0/+0
* Merge tool bug fix.Marko Grönroos2010-03-011-1/+1
* Merged all 5.4 build script and testing tools related changes to 6.0Artur Signell2009-04-201-7/+4
* Fixed a subversion 1.5 compatibility problem in merge tool.Marko Grönroos2009-04-071-8/+7
* Fixed change list parsing problem in merge tool.Marko Grönroos2009-03-311-0/+4
* Merge from 5.3 to 6.0:Henri Sara2009-03-251-7/+29
* Merge from 5.3 to 6.0:Henri Sara2009-03-251-0/+682