DELTA 51348 60 125 SVN† † † † …ø'…ú‚9„ēz€yƒu„ēp…/„·c€>ŧ1„žv‚7mportant> These fixes must be tested on the quarterly branch. Adding/fixing CONFLICTS. Web Browsers, browser plugins, and their required dependenciesENDREP id: 8-5503.6j-39631.r51373/401 type: file pred: 8-5503.6j-39631.r51348/8778 count: 527 text: 51373 0 375 199942 7887f3a814f618b73258c82e83eb61bd c7f69be7526f1871f1ce3f40a66537175c1ebcf8 51372-13n1/_5 props: 38826 3764334 71 0 f676b0d0fd056c187617e885a82bfebd cpath: /head/en_US.ISO8859-1/articles/committers-guide/article.xml copyroot: 39631 /head/en_US.ISO8859-1/articles/committers-guide/article.xml PLAIN K 8 Makefile V 25 file 5-5503.0.r43392/7220 K 11 article.xml V 31 file 8-5503.6j-39631.r51373/401 END ENDREP id: 3-5503.0.r51373/919 type: dir pred: 3-5503.0.r51348/9298 count: 535 text: 51373 804 102 0 f1725762cdc498b8513a7ab36eac16bc cpath: /head/en_US.ISO8859-1/articles/committers-guide copyroot: 0 / PLAIN K 8 Makefile V 24 file 5-5368.0.r51293/235 K 12 Makefile.inc V 27 file 8-5368.0.r39534/270557 K 8 bsdl-gpl V 27 dir 3-25925.0.r43184/519776 K 17 building-products V 25 dir 3-26331.0.r51348/8578 K 16 committers-guide V 23 dir 3-5503.0.r51373/919 K 12 contributing V 24 dir 35-3728.0.r51350/573 K 12 contributors V 25 dir 3-10127.0.r51368/1381 K 4 cups V 24 dir 3-32107.0.r46469/636 K 14 explaining-bsd V 23 dir 3-9009.0.r48151/723 K 17 filtering-bridges V 23 dir 3-9708.0.r44681/643 K 5 fonts V 24 dir 1p-543.0.r50805/2171 K 17 freebsd-questions V 25 dir 3-8795.0.r51348/10739 K 14 freebsd-releng V 31 dir 5-43296.0-50119.r51087/1027 K 21 freebsd-update-server V 26 dir 5-36917.0.r51348/11572 K 10 geom-class V 24 dir 3-25510.0.r48489/560 K 16 gjournal-desktop V 26 dir 5-31928.0.r51348/12308 K 4 hubs V 24 dir 3-12041.0.r50972/574 K 10 ipsec-must V 23 dir 3-7457.0.r44703/732 K 9 ldap-auth V 25 dir 5-32104.0.r47080/1127 K 12 leap-seconds V 24 dir 5-46873.0.r51243/633 K 15 linux-emulation V 24 dir 5-31613.0.r50666/589 K 11 linux-users V 24 dir 7-31637.0.r50978/560 K 16 mailing-list-faq V 24 dir 5-21123.0.r51015/598 K 7 nanobsd V 25 dir 5-27852.0.r44936/2093 K 9 new-users V 23 dir 22-543.0.r46448/552 K 9 p4-primer V 24 dir 3-26410.0.r48711/779 K 3 pam V 24 dir 3-11354.0.r50940/959 K 7 pgpkeys V 24 dir 5-44243.0.r50974/542 K 22 port-mentor-guidelines V 26 dir 5-37444.0.r51348/13049 K 13 pr-guidelines V 26 dir 5-13011.0.r51348/13778 K 15 problem-reports V 26 dir 3-11273.0.r51348/14503 K 12 rc-scripting V 24 dir 3-28918.0.r44709/606 K 6 releng V 25 dir 3-11547.0.r51011/2490 K 14 remote-install V 26 dir 5-31826.0.r51348/15226 K 11 serial-uart V 23 dir 3-9882.0.r44692/663 K 11 solid-state V 24 dir 3-9649.0.r44923/1008 K 5 vinum V 31 dir 4-13852.0-46294.r50804/7157 K 9 vm-design V 26 dir 3-8116.0.r43184/553020 END ENDREP id: 1n-543.0.r51373/2954 type: dir pred: 1n-543.0.r51368/3417 count: 4654 text: 51373 1116 1825 0 8d6389b269a031ac9f1077a0ecc43179 cpath: /head/en_US.ISO8859-1/articles copyroot: 0 / minfo-cnt: 1 PLAIN K 8 Makefile V 28 file 5-4475.0.r38826/3828048 K 12 Makefile.inc V 30 file 3i-38822.0.r38826/3745023 K 8 articles V 24 dir 1n-543.0.r51373/2954 K 5 books V 24 dir 7-2631.0.r51370/2563 K 8 captions V 28 dir 2-35279.0.r38826/2922080 K 5 flyer V 24 dir 2-19823.0.r51341/551 K 6 htdocs V 30 dir ah-543.3-38821.r51356/3814 K 5 share V 24 dir e-3732.0.r51287/1339 K 6 slides V 28 dir 2-22264.0.r39632/1330081 END ENDREP id: 1m-543.0.r51373/3571 type: dir pred: 1m-543.0.r51370/3164 count: 19144 text: 51373 3151 407 0 be7c5c723391e1106f42041effe80154 props: 50119 7696 607 0 cf30ceec2a0820226782b7848daa338a cpath: /head/en_US.ISO8859-1 copyroot: 0 / minfo-cnt: 6 minfo-here: y PLAIN K 10 .arcconfig V 24 file 1-45046.0.r49438/40 K 8 Makefile V 23 file 1-1581.0.r47296/58 K 6 README V 23 file 1-7046.0.r50518/49 K 11 bn_BD.UTF-8 V 30 dir 1-20059.0-43126.r50397/977 K 15 da_DK.ISO8859-1 V 25 dir 1-16235.0.r51078/1290 K 15 de_DE.ISO8859-1 V 24 dir 1-7315.0.r51321/3223 K 15 el_GR.ISO8859-7 V 25 dir 1-12196.0.r51100/8706 K 15 en_US.ISO8859-1 V 24 dir 1m-543.0.r51373/3571 K 15 es_ES.ISO8859-1 V 25 dir 14-3137.0.r51078/9313 K 15 fr_FR.ISO8859-1 V 25 dir 1-6043.0.r51100/12697 K 15 hu_HU.ISO8859-2 V 26 dir 1-30035.0.r51100/16323 K 16 it_IT.ISO8859-15 V 26 dir a-10809.0.r51100/19728 K 11 ja_JP.eucJP V 24 dir 6u-663.0.r51367/6551 K 11 ko_KR.UTF-8 V 25 dir 1-47294.0.r51014/2307 K 11 mn_MN.UTF-8 V 26 dir 1-29997.0.r51100/26380 K 15 nl_NL.ISO8859-1 V 25 dir 1-7243.0.r51100/29994 K 15 no_NO.ISO8859-1 V 27 dir 1-13597.0.r43126/640420 K 15 pl_PL.ISO8859-2 V 26 dir 1-14391.0.r51100/33155 K 15 pt_BR.ISO8859-1 V 26 dir 1-11957.0.r51078/28670 K 12 ru_RU.KOI8-R V 26 dir 16-3975.0.r51293/10478 K 5 share V 24 dir e-4110.0.r51372/7297 K 15 sr_YU.ISO8859-2 V 24 dir 1-9381.0.r43185/4853 K 15 tr_TR.ISO8859-9 V 26 dir 1-18324.0.r51078/34693 K 11 zh_CN.UTF-8 V 32 dir 1-22297.0-43188.r51100/40911 K 11 zh_TW.UTF-8 V 31 dir 14-4154.0-44974.r51371/2679 END ENDREP id: 2-1.0.r51373/5104 type: dir pred: 2-1.0.r51372/8820 count: 33475 text: 51373 3830 1261 0 1a9377990c3ec63ee0836ba4a3005123 cpath: /head copyroot: 0 / minfo-cnt: 27 PLAIN K 21 doc-branch-policy.txt V 26 file 0-39629.0.r39629/2033 K 4 head V 21 dir 2-1.0.r51373/5104 K 8 projects V 23 dir 3-1.0.r45131/407143 K 7 release V 21 dir 4-1.0.r50774/3486 K 8 svnadmin V 21 dir 5-1.0.r50876/1878 K 12 translations V 22 dir 6-1.0.r47860/15013 K 4 user V 20 dir 7-1.0.r50268/287 END ENDREP id: 0.0.r51373/5586 type: dir pred: 0.0.r51372/9302 count: 51373 text: 51373 5272 301 0 f30dff49f0b694a45779aff002d5b956 cpath: / copyroot: 0 / minfo-cnt: 450 8-5503.6j-39631.t51372-13n1 modify-file true false /head/en_US.ISO8859-1/articles/committers-guide/article.xml 5586 5746