summaryrefslogtreecommitdiffstats
path: root/src/merge.h
Commit message (Expand)AuthorAgeFilesLines
* relase 0.3Lennart Poettering2003-11-301-1/+1
* many fixesLennart Poettering2003-08-291-0/+1
* added copyright noticeLennart Poettering2003-08-281-0/+20
* implemented merging an patch makingLennart Poettering2003-08-281-1/+1
* Initial commitLennart Poettering2003-08-261-0/+8