2014-11-25 | Jérôme Benoit | Fix up more conflicts. Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org> |
commit | commitdiff | tree |
2014-11-25 | Jérôme Benoit | Merge branch 'master' of https://github.com/juhovh... Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org> |
commit | commitdiff | tree |
2014-11-25 | Jérôme Benoit | Clean up the mess in the upstream branch. Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org> |
commit | commitdiff | tree |
2014-11-25 | Jérôme Benoit | Imported Upstream version 0.9.0 |
commit | commitdiff | tree |