Fix up more conflicts.
[deb_shairplay.git] / src / lib / crypto /
2014-11-25  Jérôme BenoitMerge branch 'master' of https://github.com/juhovh...
2014-11-25  Jérôme BenoitClean up the mess in the upstream branch.
2014-11-25  Jérôme BenoitImported Upstream version 0.9.0
2012-05-31  Juho Vähä-HerttuaAdd autotools build scripts and new shairplay program
2012-05-16  Juho Vähä-HerttuaAdd the STDCALL definition just to be sure
2012-05-16  Memphiz[windows] - fixups for building on windows
2012-05-16  Juho Vähä-HerttuaSeveral smaller fixes to compile on windows
2012-05-16  Juho Vähä-HerttuaMove src to src/lib, include to src/include, test to...