head 1.2; access; symbols perseant-exfatfs-base-20250801:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.6 perseant-exfatfs-base:1.2 cjep_sun2x:1.2.0.4 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 cjep_staticlib_x:1.2.0.2 cjep_staticlib_x-base:1.2 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 phil-wifi-20200406:1.2 pgoyette-compat-merge-20190127:1.1.1.1.2.3 pgoyette-compat-20190127:1.2 pgoyette-compat-20190118:1.2 pgoyette-compat-1226:1.1.1.1 pgoyette-compat-1126:1.1.1.1 pgoyette-compat-1020:1.1.1.1 pgoyette-compat-0930:1.1.1.1 pgoyette-compat:1.1.1.1.0.2 pgoyette-compat-0906:1.1.1.1 bind-9-12-2-P1:1.1.1.1 ISC:1.1.1; locks; strict; comment @# @; 1.2 date 2019.01.09.16.55.20; author christos; state dead; branches; next 1.1; commitid grd0QDgIEpef587B; 1.1 date 2018.08.12.12.08.37; author christos; state Exp; branches 1.1.1.1; next ; commitid vA9SFKj6FegqiPNA; 1.1.1.1 date 2018.08.12.12.08.37; author christos; state Exp; branches 1.1.1.1.2.1; next ; commitid vA9SFKj6FegqiPNA; 1.1.1.1.2.1 date 2018.08.12.12.08.37; author pgoyette; state dead; branches; next 1.1.1.1.2.2; commitid HCi1bXD317XIK0RA; 1.1.1.1.2.2 date 2018.09.06.06.55.14; author pgoyette; state Exp; branches; next 1.1.1.1.2.3; commitid HCi1bXD317XIK0RA; 1.1.1.1.2.3 date 2019.01.18.08.50.05; author pgoyette; state dead; branches; next ; commitid Lmlzg3OVT2cd6f8B; desc @@ 1.2 log @merge conflicts, bump major, fix build. @ text @syntax("kyuafile", 1) test_suite("atf") atf_test_program{name="dynstr_test"} atf_test_program{name="env_test"} atf_test_program{name="fs_test"} atf_test_program{name="list_test"} atf_test_program{name="map_test"} atf_test_program{name="process_test"} atf_test_program{name="sanity_test"} atf_test_program{name="text_test"} atf_test_program{name="user_test"} @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Import bind-9.12.2-P2 since bind-9.10 (the last BSD version) is now out of support. The changes since our last version imported (9.10.7) version are too big to include inline here; please consult the CHANGES file in this directory. @ text @@ 1.1.1.1.2.1 log @file Kyuafile was added on branch pgoyette-compat on 2018-09-06 06:55:14 +0000 @ text @d1 13 @ 1.1.1.1.2.2 log @Sync with HEAD Resolve a couple of conflicts (result of the uimin/uimax changes) @ text @a0 13 syntax("kyuafile", 1) test_suite("atf") atf_test_program{name="dynstr_test"} atf_test_program{name="env_test"} atf_test_program{name="fs_test"} atf_test_program{name="list_test"} atf_test_program{name="map_test"} atf_test_program{name="process_test"} atf_test_program{name="sanity_test"} atf_test_program{name="text_test"} atf_test_program{name="user_test"} @ 1.1.1.1.2.3 log @Synch with HEAD @ text @@