Vladimír Čunát 89023c38fc Recover the complicated situation after my bad merge ... I made a mistake merge. Reverting it in c778945806 undid the state on master, but now I realize it crippled the git merge mechanism. As the merge contained a mix of commits from `master..staging-next` and other commits from `staging-next..staging`, it got the `staging-next` branch into a state that was difficult to recover. I reconstructed the "desired" state of staging-next tree by: - checking out the last commit of the problematic range: 4effe769e2 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken merge commit and its revert from that range (while keeping reapplication from 4effe769e2) - merging the last unaffected staging-next commit (803ca85c20) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state		2020-10-26 09:01:04 +01:00
..
adapta-backgrounds
brise
cacert	nss-cacert: add license	2020-06-27 00:54:50 +02:00
cldr-emoji-annotation	cldr-emoji-annotation: 37.0_13.0_0_1 -> 37.0_13.0_0_2	2020-09-01 23:42:39 +02:00
combinatorial_designs
conway_polynomials	treewide: remove periods from end of package descriptions	2020-10-17 08:22:31 -07:00
ddccontrol-db
dns-root-data	dns-root-data: switch to new URL	2020-07-01 16:20:48 +02:00
elliptic_curves
freepats
geolite-legacy
graphs
hackage	all-cabal-hashes: update to Hackage at 2020-10-22T01:32:08Z	2020-10-23 21:00:26 +02:00
iana-etc	iana-etc: 20200407 -> 20200729	2020-08-01 09:57:46 +01:00
libkkc-data
mailcap
media-player-info
mime-types
miscfiles
mobile-broadband-provider-info
nixos-artwork	nixos-artwork: add missing wallpapers	2020-07-04 00:31:18 +02:00
osinfo-db	osinfo-db: 20200529 -> 20200804	2020-08-16 23:48:40 +02:00
pari-galdata
pari-seadata-small
polytopes_db
poppler-data
publicsuffix-list
scowl
shared-desktop-ontologies
shared-mime-info
sound-theme-freedesktop
spdx-license-list-data	spdx-license-list-data: 3.9 -> 3.10	2020-08-11 14:29:58 +00:00
tzdata	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
unicode-character-database
unicode-emoji
unihan-database
wireless-regdb
xorg-rgb