commit fdf5d90f9faecf78634306a8e7cc2411bfde7a51
Merge: 1f9c22a 419d2c4
Author: Jakub Bogusz <[email protected]>
Date: Fri Feb 14 17:39:51 2014 +0100
Merge branch 'master' of git://git.pld-linux.org/packages/daala
Conflicts:
daala.spec
---
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/daala.git/commitdiff/fdf5d90f9faecf78634306a8e7cc2411bfde7a51
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
