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
..
2.8.nix	treewide: Per RFC45, remove all unquoted URLs	2020-04-10 17:54:53 +01:00
3.2.2-cygwin.patch
application-services.patch	cmake: 3.17.3 -> 3.18.0	2020-07-26 18:57:06 +02:00
default.nix	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
libuv-application-services.patch	cmake: 3.17.3 -> 3.18.0	2020-07-26 18:57:06 +02:00
search-path-2.8.patch
search-path.patch	cmake: 3.17.3 -> 3.18.0	2020-07-26 18:57:06 +02:00
setup-hook.sh	cmake: fix CMAKE_FIND_FRAMEWORK	2020-08-29 13:37:56 +02:00