summaryrefslogtreecommitdiffstats
path: root/src/merge.c
Commit message (Expand)AuthorAgeFilesLines
* * cleanup trash recursivelyLennart Poettering2005-06-051-1/+1
* assorted stuffLennart Poettering2004-12-031-16/+42
* prepare for next releaseLennart Poettering2004-10-141-36/+11
* relase 0.3Lennart Poettering2003-11-301-18/+64
* prepared for release 0.2Lennart Poettering2003-09-091-6/+9
* Many fixes, primarily documentationLennart Poettering2003-09-071-2/+6
* filename hashing implementedLennart Poettering2003-08-311-4/+22
* many fixesLennart Poettering2003-08-291-51/+80
* added copyright noticeLennart Poettering2003-08-281-0/+20
* directory merge fixesLennart Poettering2003-08-281-12/+117
* implemented merging an patch makingLennart Poettering2003-08-281-17/+52
* Initial commitLennart Poettering2003-08-261-0/+132