git » debian:kxd » commit f5d6db5

Merge upstream repository

author Alberto Bertogli
2017-07-30 17:05:34 UTC
committer Alberto Bertogli
2017-07-30 17:05:34 UTC
parent 6182dc8fea87e5005b6f2b837572ed997810645f
parent fe04e43540dfc62d7cf9ad1ffc93ddcfb19f694c

Merge upstream repository

Up until now, we've been importing upstream as snapshots, dropping the
commit history.

Given that upstream also uses git, this doesn't have much value and
makes tracking the state of the tree more difficult.

So with this commit we merge the two, with the idea of being able to use
git to track upstream from now on.