]> git.ipfire.org Git - thirdparty/cups.git/history - cups/conflicts.c
Merge changes from CUPS 1.4svn-r8252.
[thirdparty/cups.git] / cups / conflicts.c
2009-01-14  msweetMerge changes from CUPS 1.4svn-r8252.
2009-01-09  msweetMerge changes from CUPS 1.4svn-r8227.
2008-10-17  msweetMerge changes from CUPS 1.4svn-r8067 (tentative CUPS...
2008-08-26  msweetMerge changes from CUPS 1.4svn-r7864.
2008-07-24  msweetMerge changes from CUPS 1.4svn-r7791.
2008-07-18  msweetMerge changes from CUPS 1.4svn-r7770.
2008-07-18  msweetAdd missing files.