Le Tue 17 Aug 10 à 22:51 +0000, xtophe-gu...@users.alioth.debian.org a écrit : > > Merge commit 'upstream/0.9.11' > > Conflicts: [...]
Argh. I messed up again. Forgot to check that my upstream branch was up-to-date. I really need to add a hook to git-import-orig. I sort the mess tomorow but please don't pull from alioth in the mean time -- Xtophe _______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers
