[SCM] libmkv/master: Move .gitignore to debian/ to avoid merge conflicts with upstream.

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Thu Feb 2 13:19:07 UTC 2012


The following commit has been merged in the master branch:
commit a29fd4e0934884e9f6d3933092fd158e69dc27a6
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Thu Feb 2 14:02:49 2012 +0100

    Move .gitignore to debian/ to avoid merge conflicts with upstream.

diff --git a/.gitignore b/debian/.gitignore
similarity index 100%
rename from .gitignore
rename to debian/.gitignore

-- 
libmkv packaging



More information about the pkg-multimedia-commits mailing list