summaryrefslogtreecommitdiffstats
path: root/src/merge.h
Commit message (Collapse)AuthorAgeFilesLines
* relase 0.3Lennart Poettering2003-11-301-1/+1
| | | | | | | | | | --copy-always --sort bi-directory merges --check-md git-svn-id: file:///home/lennart/svn/public/syrep/trunk@43 07ea20a6-d2c5-0310-9e02-9ef735347d72
* many fixesLennart Poettering2003-08-291-0/+1
| | | | | | | --cleanup implemented git-svn-id: file:///home/lennart/svn/public/syrep/trunk@13 07ea20a6-d2c5-0310-9e02-9ef735347d72
* added copyright noticeLennart Poettering2003-08-281-0/+20
| | | | git-svn-id: file:///home/lennart/svn/public/syrep/trunk@12 07ea20a6-d2c5-0310-9e02-9ef735347d72
* implemented merging an patch makingLennart Poettering2003-08-281-1/+1
| | | | git-svn-id: file:///home/lennart/svn/public/syrep/trunk@9 07ea20a6-d2c5-0310-9e02-9ef735347d72
* Initial commitLennart Poettering2003-08-261-0/+8
git-svn-id: file:///home/lennart/svn/public/syrep/trunk@2 07ea20a6-d2c5-0310-9e02-9ef735347d72