summaryrefslogtreecommitdiff
path: root/source
AgeCommit message (Collapse)AuthorFilesLines
2009-07-06merge upstream 3.4.0bubulle1599-1031006/+0
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2936 fc4039ab-9d04-0410-8cac-899223bdd6b0
2009-06-23merge upstream 3.3.6bubulle3-15/+13
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2918 fc4039ab-9d04-0410-8cac-899223bdd6b0
2009-06-18Really merge 3.3.5bubulle39-197/+613
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2858 fc4039ab-9d04-0410-8cac-899223bdd6b0
2009-06-18Revert the 3.3.5 merge which I did in an unclean copy of the trunk..:-(bubulle66-1147/+568
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2857 fc4039ab-9d04-0410-8cac-899223bdd6b0
2009-06-18merge upstream 3.3.5bubulle66-568/+1147
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2855 fc4039ab-9d04-0410-8cac-899223bdd6b0
2009-05-02merge upstream 3.3.4bubulle51-222/+795
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2741 fc4039ab-9d04-0410-8cac-899223bdd6b0
2009-04-02merge upstream 3.3.3bubulle89-738/+3198
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2683 fc4039ab-9d04-0410-8cac-899223bdd6b0
2009-03-13merge upstream 3.3.2bubulle58-219/+1062
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2651 fc4039ab-9d04-0410-8cac-899223bdd6b0
2009-02-28merge upstream 3.3.1bubulle179-1740/+24883
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2614 fc4039ab-9d04-0410-8cac-899223bdd6b0
2009-02-15add a missing header file that should have been here since 3.2 on, but missedvorlon1-0/+0
the import somehow git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2579 fc4039ab-9d04-0410-8cac-899223bdd6b0
2009-02-14merge upstream 3.3.0vorlon722-47366/+140890
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2571 fc4039ab-9d04-0410-8cac-899223bdd6b0
2008-11-27merge upstream 3.2.5bubulle5-12/+12
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2214 fc4039ab-9d04-0410-8cac-899223bdd6b0
2008-10-04merge upstream 3.2.4vorlon80-576/+1701
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2177 fc4039ab-9d04-0410-8cac-899223bdd6b0
2008-08-27merge upstream 3.2.3vorlon4-5/+11
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2152 fc4039ab-9d04-0410-8cac-899223bdd6b0
2008-08-20merge upstream 3.2.2bubulle44-741/+1633
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2130 fc4039ab-9d04-0410-8cac-899223bdd6b0
2008-08-11merge upstream 3.2.1vorlon57-517/+779
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2116 fc4039ab-9d04-0410-8cac-899223bdd6b0
2008-07-20merge samba 3.2 experimental branch to unstablevorlon1387-154697/+413260
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2053 fc4039ab-9d04-0410-8cac-899223bdd6b0
2008-07-13merge upstream 3.0.31bubulle47-416/+888
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2035 fc4039ab-9d04-0410-8cac-899223bdd6b0
2008-06-17merge 3.0.30 into the debian branch... three releases late(!)vorlon8-34/+26
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@1974 fc4039ab-9d04-0410-8cac-899223bdd6b0
2008-05-22Merge upstream 3.0.29 in trunkbubulle68-324/+1063
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@1886 fc4039ab-9d04-0410-8cac-899223bdd6b0
2008-03-09merge upstream 3.0.28avorlon100-811/+2327
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@1757 fc4039ab-9d04-0410-8cac-899223bdd6b0
2007-12-12merge upstream 3.0.28debian/3.0.28-1vorlon6-9/+22
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@1673 fc4039ab-9d04-0410-8cac-899223bdd6b0
2007-11-21merge upstream 3.0.27a into svnvorlon1020-0/+646469
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@1586 fc4039ab-9d04-0410-8cac-899223bdd6b0