summaryrefslogtreecommitdiff
path: root/doc/image/conflict.dia
AgeCommit message (Expand)AuthorFilesLines
2013-01-31fix width and imagesJan Klemkow1-0/+0
2013-01-31add imaes for presentationJan Klemkow1-0/+0