]> git.ipfire.org Git - thirdparty/bird.git/commit
projects / thirdparty / bird.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f8a4a9a) | patch
merging: There is conflict in usage of bird_thread_commit. The problem is in adding... try-to-merge
authorKaterina Kubecova <katerina.kubecova@nic.cz>
Thu, 6 Mar 2025 11:53:39 +0000 (12:53 +0100)
committerKaterina Kubecova <katerina.kubecova@nic.cz>
Thu, 6 Mar 2025 11:53:39 +0000 (12:53 +0100)
commit89dc7931fc9a59d857be347390a203dc9e22b009
treee324446145aba4ea0f73f90c9d986aacf738bf3btree
parentf8a4a9a57cf7be0c3de293022158b9d1cc654fe5commit | diff
merging: There is conflict in usage of bird_thread_commit. The problem is in adding struct config *old parameter and new usage of bird_thread_commit in main.c. (in addition, this causes include conflict with conf.h)
lib/io-loop.h diff | blob | blame | history
sysdep/unix/io-loop.c diff | blob | blame | history
Mirror of https://gitlab.labs.nic.cz/labs/bird.git