summaryrefslogtreecommitdiff
path: root/share
AgeCommit message (Expand)Author
2005-12-09* "normal" merge, resolved lots of conflictsMichael Vogt
2005-06-26Merge with mainlineMatt Zimmerman
2005-06-26* merged/removed conflicts with apt--main--0Michael Vogt
2005-06-25Merge from Debian branchMatt Zimmerman
2004-12-13Merge apt--authentication--0Matt Zimmerman
2004-12-20* merged changes from the conferenceMichael Vogt