git: Merge branch 'vendor/FILE'

2022-03-13 Thread Sascha Wildner
commit 7b80531f545c7d3c51c1660130c71d01f6bccbe0 Merge: f7a9ce1625 614728ca5a Author: Sascha Wildner Date: Sun Mar 13 11:33:13 2022 +0100 Merge branch 'vendor/FILE' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/7b80531f545c7d3c51c1660130c71d01f6bccbe0 --

git: Merge branch 'vendor/OPENSSH'

2021-10-09 Thread Sascha Wildner
commit e7c7c9677fb8cfd51d5290e5d9017a9e36538d58 Merge: 1edc50a1f6 50a69bb511 Author: Sascha Wildner Date: Sat Oct 9 13:25:09 2021 +0200 Merge branch 'vendor/OPENSSH' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/e7c7c9677fb8cfd51d5290e5d9017a9e36538d58 --

git: Merge branch 'vendor/MDOCML'

2021-09-24 Thread Sascha Wildner
commit 1e4d43f9c96723e4e55543d240f182e1aac9a4c2 Merge: bda2cd54bb 99db7d0eb1 Author: Sascha Wildner Date: Fri Sep 24 22:26:26 2021 +0200 Merge branch 'vendor/MDOCML' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/1e4d43f9c96723e4e55543d240f182e1aac9a4c2 --

git: Merge branch 'vendor/PAM_PASSWDQC'

2021-07-20 Thread Sascha Wildner
commit 44624ade5c7148822b0294730bae4f64e40124db Merge: 076918c9b6 8c11729384 Author: Sascha Wildner Date: Tue Jul 20 16:52:42 2021 +0200 Merge branch 'vendor/PAM_PASSWDQC' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/44624ade5c7148822b0294730bae4f64e40124d

git: Merge branch 'vendor/FILE'

2021-07-06 Thread Sascha Wildner
commit 418d255e7aa32651080462aca94daeb5c367cb55 Merge: a3b4d6d838 970935fd37 Author: Sascha Wildner Date: Tue Jul 6 20:47:45 2021 +0200 Merge branch 'vendor/FILE' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/418d255e7aa32651080462aca94daeb5c367cb55 -- D

git: Merge branch 'vendor/BMAKE'

2021-03-27 Thread Sascha Wildner
commit 3895fae960dbd29cba579f2ba9be126d41525528 Merge: 87d9878f90 ec53370882 Author: Sascha Wildner Date: Sat Mar 27 11:30:43 2021 +0100 Merge branch 'vendor/BMAKE' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/3895fae960dbd29cba579f2ba9be126d41525528 --

git: Merge branch 'vendor/BZIP'

2020-05-22 Thread Sascha Wildner
commit d9ad29c0511b752ac1e5cb3f9d537a66f4bfded4 Merge: 46d448bee7 8695443622 Author: Sascha Wildner Date: Fri May 22 20:36:11 2020 +0200 Merge branch 'vendor/BZIP' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/d9ad29c0511b752ac1e5cb3f9d537a66f4bfded4 --

git: Merge branch 'vendor/WPA_SUPPLICANT'

2020-05-21 Thread Sascha Wildner
commit 3a84a4273475ed07d0ab1c2dfeffdfedef35d9cd Merge: 08e5312767 a115783565 Author: Sascha Wildner Date: Thu May 21 21:31:34 2020 +0200 Merge branch 'vendor/WPA_SUPPLICANT' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/3a84a4273475ed07d0ab1c2dfeffdfedef35d

git: Merge branch 'vendor/FILE'

2020-05-08 Thread Sascha Wildner
commit f6bc0519ce99ecd95adab137676160bcf74260ef Merge: 802fda022d e88a9a209f Author: Sascha Wildner Date: Fri May 8 13:34:35 2020 +0200 Merge branch 'vendor/FILE' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/f6bc0519ce99ecd95adab137676160bcf74260ef -- D

git: Merge branch 'vendor/DHCPCD'

2020-04-13 Thread Roy Marples
commit b13ef84f4261fe27e6d17e244d4940878bc17be4 Merge: 5d68103c5c 280986e4c0 Author: Roy Marples Date: Mon Apr 13 16:39:54 2020 + Merge branch 'vendor/DHCPCD' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/b13ef84f4261fe27e6d17e244d4940878bc17be4 -- D

git: Merge branch 'vendor/TCSH'

2020-04-01 Thread Sascha Wildner
commit 72479f1e21b259ea09ee62654c1899dd63475ca0 Merge: 8c741249a4 653fab9eba Author: Sascha Wildner Date: Wed Apr 1 20:55:08 2020 +0200 Merge branch 'vendor/TCSH' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/72479f1e21b259ea09ee62654c1899dd63475ca0 -- D

git: Merge branch 'vendor/OPENBSD_LIBM'

2020-02-10 Thread Sascha Wildner
commit 8c81fb44002542be00663a0e43eba0d7591e36c2 Merge: 77462c5e82 1bd3f1e4c4 Author: Sascha Wildner Date: Mon Feb 10 17:25:16 2020 +0100 Merge branch 'vendor/OPENBSD_LIBM' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/8c81fb44002542be00663a0e43eba0d7591e36c

git: Merge branch 'vendor/FLEX'

2020-01-19 Thread Sascha Wildner
commit 388e4ddaf1c230f115961bdb4bad6a8d3e017c93 Merge: 864b1bf00d d9805213bd Author: Sascha Wildner Date: Sun Jan 19 11:25:39 2020 +0100 Merge branch 'vendor/FLEX' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/388e4ddaf1c230f115961bdb4bad6a8d3e017c93 --

git: Merge dhcpcd-8.0.4 from branch 'vendor/DHCPCD'

2019-09-04 Thread Roy Marples
commit ee11d92bca8b40fdee1d1c9bfa3d8abe6627b28a Merge: 4d2728915d 8d36e1df80 Author: Roy Marples Date: Wed Sep 4 19:29:08 2019 +0100 Merge dhcpcd-8.0.4 from branch 'vendor/DHCPCD' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/ee11d92bca8b40fdee1d1c9bfa3d8ab

git: Merge remote-tracking branch 'origin/vendor/LIBEDIT'

2019-04-30 Thread Rimvydas Jasinskas
commit e1b2cf92364a2a8de3308135714fd3063c8d76db Merge: 7eb1db9120 ae19eda893 Author: zrj Date: Tue Apr 30 23:44:55 2019 +0300 Merge remote-tracking branch 'origin/vendor/LIBEDIT' Conflicts: contrib/libedit/src/chartype.h Summary of changes: http://gitweb.dragonflybsd.o

git: Merge remote-tracking branch 'origin/vendor/LIBEDIT'

2019-04-30 Thread Rimvydas Jasinskas
commit 30baa437bb9bd1152f19689c2d0442f652174e87 Merge: 02aa41ec25 12db70c866 Author: zrj Date: Tue Apr 30 20:59:56 2019 +0300 Merge remote-tracking branch 'origin/vendor/LIBEDIT' Conflicts: contrib/libedit/src/chartype.h contrib/libedit/src/eln.c contrib/

git: Merge remote-tracking branch 'origin/vendor/LDNS'

2019-04-24 Thread Rimvydas Jasinskas
commit 188cd41447c6d13ba978a9c67045d1c299a82d91 Merge: 5339abd423 5340022ad9 Author: zrj Date: Wed Apr 24 20:14:10 2019 +0300 Merge remote-tracking branch 'origin/vendor/LDNS' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/188cd41447c6d13ba978a9c67045d1c299a

git: Merge remote-tracking branch 'origin/vendor/OPENSSH'

2019-04-24 Thread Rimvydas Jasinskas
commit 846bf9723e99c70b8357a3d82ff72802852b9fd2 Merge: a4a3adb1a8 664f47636b Author: zrj Date: Wed Apr 24 20:16:54 2019 +0300 Merge remote-tracking branch 'origin/vendor/OPENSSH' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/846bf9723e99c70b8357a3d82ff72802

git: Merge remote-tracking branch 'origin/vendor/LIBARCHIVE'

2019-04-24 Thread Rimvydas Jasinskas
commit f7e775d27fdae03f5e00996ccea7807a56f8f822 Merge: 718f155bd9 e95abc476b Author: zrj Date: Wed Apr 24 20:12:03 2019 +0300 Merge remote-tracking branch 'origin/vendor/LIBARCHIVE' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/f7e775d27fdae03f5e00996ccea78

git: Merge remote-tracking branch 'origin/vendor/LIBRESSL'

2019-04-24 Thread Rimvydas Jasinskas
commit da50c0b74e76bb4f65116eed78f9aa4b6928ae2c Merge: 2a96f3821f 72c3367655 Author: zrj Date: Wed Apr 24 20:10:42 2019 +0300 Merge remote-tracking branch 'origin/vendor/LIBRESSL' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/da50c0b74e76bb4f65116eed78f9aa4

git: Merge branch 'vendor/MDOCML'

2019-03-17 Thread Sascha Wildner
commit a5dca70a199ab4fffe33a6903ef1b94c7d102d21 Merge: 1dac82a76a 54ba96075f Author: Sascha Wildner Date: Sun Mar 17 13:31:04 2019 +0100 Merge branch 'vendor/MDOCML' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/a5dca70a199ab4fffe33a6903ef1b94c7d102d21 --

git: Merge branch 'vendor/OPENSSH'

2018-07-24 Thread Sascha Wildner
commit b11ab2469a6c213f1f13d8343b2f7cecea15a6a6 Merge: c98db40744 5b51d7ac0d Author: Sascha Wildner Date: Tue Jul 24 13:25:57 2018 +0200 Merge branch 'vendor/OPENSSH' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/b11ab2469a6c213f1f13d8343b2f7cecea15a6a6 -

git: Merge branch 'vendor/OPENPAM'

2018-07-07 Thread Sascha Wildner
commit 7031abe4d1ef8c309d4113438494530b74f3f3fe Merge: f897b37923 10b5fe877b Author: Sascha Wildner Date: Sat Jul 7 20:26:09 2018 +0200 Merge branch 'vendor/OPENPAM' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/7031abe4d1ef8c309d4113438494530b74f3f3fe --

git: Merge branch 'vendor/LIBPCAP'

2018-03-17 Thread Antonio Huete Jimenez
commit 8df572896d4c54d6c6c5a2fd7214eb5d68fdbd78 Merge: 5062ee702b 97a9217a80 Author: Antonio Huete Jimenez Date: Sat Mar 17 08:44:00 2018 -0700 Merge branch 'vendor/LIBPCAP' Conflicts: contrib/libpcap/scanner.l Summary of changes: http://gitweb.dragonflybsd.org/dragonfly

git: Merge branch 'vendor/FILE'

2017-09-23 Thread Sascha Wildner
commit 3015ae9fa172738ea3b2601df0d9c8d24b3d4e39 Merge: 62e32461be c30bd0917b Author: Sascha Wildner Date: Sat Sep 23 21:23:05 2017 +0200 Merge branch 'vendor/FILE' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/3015ae9fa172738ea3b2601df0d9c8d24b3d4e39 -- D

git: Merge branch 'vendor/BMAKE'

2016-08-29 Thread John Marino
commit 9a8f24bf27e38c37cda8a86cdeb34e2ae52aee6b Merge: 6ebf792 f445c89 Author: John Marino Date: Mon Aug 29 08:21:47 2016 -0500 Merge branch 'vendor/BMAKE' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/9a8f24bf27e38c37cda8a86cdeb34e2ae52aee6b -- DragonFly

git: Merge branch 'vendor/GCC50'

2016-08-27 Thread John Marino
commit 385754ab92bea0f51c59b841b298f2ec157e5f2d Merge: fdba954 d5d214b Author: John Marino Date: Sat Aug 27 22:25:21 2016 +0200 Merge branch 'vendor/GCC50' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/385754ab92bea0f51c59b841b298f2ec157e5f2d -- DragonFly

git: Merge branch 'vendor/OPENSSH'

2016-08-04 Thread Peter Avalos
commit 4821a1d69d42a70e6f9f65f01812422a9f804656 Merge: f0ea6a7 e977879 Author: Peter Avalos Date: Thu Aug 4 01:15:20 2016 -0700 Merge branch 'vendor/OPENSSH' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4821a1d69d42a70e6f9f65f01812422a9f804656 -- DragonF

git: Merge branch 'vendor/OPENSSL'

2016-08-03 Thread Peter Avalos
commit 94089e80a5f705dc760628462df38162611001cd Merge: ae1f154 5adaead Author: Peter Avalos Date: Wed Aug 3 01:18:34 2016 -0700 Merge branch 'vendor/OPENSSL' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/94089e80a5f705dc760628462df38162611001cd -- DragonF

git: Merge branch 'vendor/LIBARCHIVE'

2016-05-12 Thread Peter Avalos
commit b3bdf8df6104b2286393302fb6dd7db7a311dc16 Merge: 882823f 6b384f3 Author: Peter Avalos Date: Thu May 12 17:44:10 2016 -0700 Merge branch 'vendor/LIBARCHIVE' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/b3bdf8df6104b2286393302fb6dd7db7a311dc16 -- Dra

git: Merge branch 'vendor/OPENSSL'

2016-01-28 Thread Sascha Wildner
commit f9af0610a66295ebf52803853edf60cb6aa2b663 Merge: aaba24a 563a984 Author: Sascha Wildner Date: Thu Jan 28 23:25:50 2016 +0100 Merge branch 'vendor/OPENSSL' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/f9af0610a66295ebf52803853edf60cb6aa2b663 -- Drag

git: Merge branch 'vendor/OPENSSL'

2015-12-04 Thread Sascha Wildner
commit eb21052097e9a18ae474592b16811ca223250637 Merge: be9d724 8be1fb4 Author: Sascha Wildner Date: Fri Dec 4 21:45:43 2015 +0100 Merge branch 'vendor/OPENSSL' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/eb21052097e9a18ae474592b16811ca223250637 -- Drago

git: Merge branch 'vendor/GREP'

2015-11-04 Thread John Marino
commit 6ae79864975bffb44d3383ca417cf76973110510 Merge: 4f61cdfb dc7c36e Author: John Marino Date: Wed Nov 4 13:38:11 2015 +0100 Merge branch 'vendor/GREP' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/6ae79864975bffb44d3383ca417cf76973110510 -- DragonFly

git: Merge branch 'vendor/LIBEDIT'

2015-11-03 Thread John Marino
commit 5fd565a09d464d3d0042df9997c41e8f1995a5b5 Merge: 06dd69f a0c9eb1 Author: John Marino Date: Wed Nov 4 00:58:27 2015 +0100 Merge branch 'vendor/LIBEDIT' Conflicts: contrib/libedit/src/chartype.h contrib/libedit/src/eln.c Summary of changes: http://gitweb.drag

git: Merge branch 'vendor/BMAKE'

2015-03-22 Thread John Marino
commit d440b65333b1c27f2e049998cfa9deeb2de14061 Merge: bc64155 6a91b98 Author: John Marino Date: Sun Mar 22 21:53:06 2015 +0100 Merge branch 'vendor/BMAKE' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/d440b65333b1c27f2e049998cfa9deeb2de14061 -- DragonFly

git: Merge branch 'vendor/OPENSSL'

2015-03-19 Thread Sascha Wildner
commit b0a30de871ef6ca42aee2b4362060fbf25239245 Merge: 67ac631 9eaaad3 Author: Sascha Wildner Date: Thu Mar 19 21:06:51 2015 +0100 Merge branch 'vendor/OPENSSL' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/b0a30de871ef6ca42aee2b4362060fbf25239245 -- Drag

git: Merge branch 'vendor/GCC50'

2015-03-13 Thread John Marino
commit 3c532845e898b595e6967c6defaaf726b28dfbb5 Merge: 291dd55 f09a355 Author: John Marino Date: Fri Mar 13 16:04:18 2015 +0100 Merge branch 'vendor/GCC50' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/3c532845e898b595e6967c6defaaf726b28dfbb5 -- DragonFly

git: Merge branch 'vendor/GCC50'

2015-02-20 Thread John Marino
commit 4fadd6132fad16b41acb68dbc32812ca486a57b2 Merge: 183856d f4d9d36 Author: John Marino Date: Fri Feb 20 18:01:04 2015 +0100 Merge branch 'vendor/GCC50' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4fadd6132fad16b41acb68dbc32812ca486a57b2 -- DragonFly

git: Merge branch 'vendor/GCC50'

2015-02-13 Thread John Marino
commit c1e3d85b99dd9a18a49fc192105fb31beeb51e68 Merge: d3b628e 9f50539 Author: John Marino Date: Fri Feb 13 11:07:46 2015 +0100 Merge branch 'vendor/GCC50' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/c1e3d85b99dd9a18a49fc192105fb31beeb51e68 -- DragonFly

git: Merge branch 'vendor/OPENSSH'

2015-01-24 Thread Peter Avalos
commit 3e3d72802874166f1927330e402ca707bd582b6e Merge: 2b73a85 36e94dc Author: Peter Avalos Date: Thu Jan 22 21:54:26 2015 -0800 Merge branch 'vendor/OPENSSH' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/3e3d72802874166f1927330e402ca707bd582b6e -- Dragon

git: Merge branch 'vendor/OPENSSL'

2015-01-15 Thread Sascha Wildner
commit ec7d8cd6e0ae18eb78554384fd13c96b973f2250 Merge: 5fd16c5 4b6818e Author: Sascha Wildner Date: Thu Jan 15 22:18:26 2015 +0100 Merge branch 'vendor/OPENSSL' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/ec7d8cd6e0ae18eb78554384fd13c96b973f2250 -- Drag

git: Merge branch 'vendor/MDOCML'

2014-10-27 Thread Franco Fichtner
commit 4c72d8f557bf94c0676d37b731068ffd94993d5c Merge: 426c810 070c62a Author: Franco Fichtner Date: Mon Oct 27 23:40:16 2014 +0100 Merge branch 'vendor/MDOCML' Conflicts: contrib/mdocml/Makefile contrib/mdocml/mandoc.h contrib/mdocml/mdoc_validate.c

git: Merge branch 'vendor/OPENSSL'

2014-10-22 Thread Sascha Wildner
commit 91e03e78c3e2e920d9b7a7cf650bfcc96be15a22 Merge: e314d7e 34440c3 Author: Sascha Wildner Date: Wed Oct 22 19:30:55 2014 +0200 Merge branch 'vendor/OPENSSL' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/91e03e78c3e2e920d9b7a7cf650bfcc96be15a22 -- Drag

git: Merge branch 'vendor/LIBEDIT'

2014-10-13 Thread John Marino
commit 909ca4890c06e6c96516c2bf6138626c67d8844f Merge: ed67e9e 84b940c Author: John Marino Date: Mon Oct 13 19:10:37 2014 +0200 Merge branch 'vendor/LIBEDIT' Conflicts: contrib/libedit/src/vi.c Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/9

git: Merge branch 'vendor/GREP'

2014-10-10 Thread John Marino
commit 5be44d7264347781e3ed476d25d623ecb3181508 Merge: f561435 680a9cb Author: John Marino Date: Sat Oct 11 00:51:31 2014 +0200 Merge branch 'vendor/GREP' Conflicts: contrib/grep/src/main.c Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/5be44

git: Merge branch 'vendor/GCC47'

2014-10-10 Thread John Marino
commit 0a8dc9fc45f4d0b236341a473fac4a486375f60c Merge: 4f5ee56 95d2823 Author: John Marino Date: Fri Oct 10 18:32:41 2014 +0200 Merge branch 'vendor/GCC47' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/0a8dc9fc45f4d0b236341a473fac4a486375f60c -- DragonFly

git: Merge branch 'vendor/TNFTP'

2014-06-07 Thread Peter Avalos
commit 4a36e7f637420d9740386f247b936a254567dd14 Merge: 1fe8db0 b2fc1a8 Author: Peter Avalos Date: Sat Jun 7 09:25:39 2014 -0700 Merge branch 'vendor/TNFTP' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4a36e7f637420d9740386f247b936a254567dd14 -- DragonFly

git: Merge branch 'vendor/FILE'

2014-05-06 Thread Peter Avalos
commit a16a29cfb5ea880dda7c07758db14a1cd498f86e Merge: 99ebfb7 e8af973 Author: Peter Avalos Date: Tue May 6 15:37:33 2014 -0700 Merge branch 'vendor/FILE' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/a16a29cfb5ea880dda7c07758db14a1cd498f86e -- DragonFly

git: Merge branch 'vendor/LIBPCAP'

2014-05-03 Thread Matthew Dillon
commit 157d571ed3e4ab372cb11dc766afe65f7a5c195c Merge: abf1f4f 0e38198 Author: Matthew Dillon Date: Sat May 3 08:50:32 2014 -0700 Merge branch 'vendor/LIBPCAP' Merge for 1.4.0 Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/157d571ed3e4ab372cb11dc766a

git: Merge branch 'vendor/OPENSSL'

2014-04-07 Thread Peter Avalos
commit a29ef164df4db4a1f40d00c14edcffee86151c65 Merge: 5dfbf41 8b433ce Author: Peter Avalos Date: Mon Apr 7 18:21:14 2014 -0700 Merge branch 'vendor/OPENSSL' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/a29ef164df4db4a1f40d00c14edcffee86151c65 -- DragonF

git: Merge branch 'vendor/MDOCML'

2013-12-31 Thread Franco Fichtner
commit 9e661f299d255ce61feb1a93c31de8a171cf1838 Merge: 127b4e0 7888c61 Author: Franco Fichtner Date: Tue Dec 31 14:38:23 2013 +0100 Merge branch 'vendor/MDOCML' Conflicts: contrib/mdocml/index.sgml contrib/mdocml/lib.in contrib/mdocml/mandoc.3 contr

git: Merge branch 'vendor/MDOCML'

2013-10-06 Thread Franco Fichtner
commit 48ff368a8039fb3835a9cef5af5b06f3d4e83f93 Merge: 9daa987 f88b6c1 Author: Franco Fichtner Date: Sun Oct 6 15:42:02 2013 +0200 Merge branch 'vendor/MDOCML' Conflicts: contrib/mdocml/mandoc.3 contrib/mdocml/mdoc_macro.c Summary of changes: http://gitweb.dragon

git: Merge branch 'vendor/GDB'

2013-10-05 Thread John Marino
commit de8e141f24382815c10a4012d209bbbf7abf1112 Merge: 74a8b0f ef5ccd6 Author: John Marino Date: Sun Oct 6 00:52:30 2013 +0200 Merge branch 'vendor/GDB' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/de8e141f24382815c10a4012d209bbbf7abf1112 -- DragonFly BS

git: Merge branch 'vendor/LIBEDIT'

2013-05-11 Thread John Marino
commit 594c4953027a5ecfd13624ff56bf1a61d8898663 Merge: 441874d c8e4d2b Author: John Marino Date: Sat May 11 21:34:39 2013 +0200 Merge branch 'vendor/LIBEDIT' Conflicts: contrib/libedit/src/editline/readline.h contrib/libedit/src/readline.c Summary of changes: htt

git: Merge branch 'vendor/TCSH'

2013-05-10 Thread John Marino
commit 8a678ac10edd69a5f75d2b950efa779c690676ac Merge: f5c1f6e 94afa86 Author: John Marino Date: Sat May 11 03:29:13 2013 +0200 Merge branch 'vendor/TCSH' Conflicts: contrib/tcsh-6/sh.decls.h Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/8a6

git: Merge branch 'vendor/AWK'

2013-05-08 Thread John Marino
commit d9ce47d908bc99e3575598bde4e7bb7929fee395 Merge: 9596b8c 2078c1f Author: John Marino Date: Thu May 9 02:47:07 2013 +0200 Merge branch 'vendor/AWK' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/d9ce47d908bc99e3575598bde4e7bb7929fee395 -- DragonFly BS

git: Merge branch 'vendor/GCC47'

2013-05-08 Thread John Marino
commit 81fc95a5293ee307c688a350a3feb4734aaddbb4 Merge: 737d9e7 5ce9237 Author: John Marino Date: Wed May 8 18:37:36 2013 +0200 Merge branch 'vendor/GCC47' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/81fc95a5293ee307c688a350a3feb4734aaddbb4 -- DragonFly

git: Merge into and remove it.

2013-04-29 Thread Sascha Wildner
commit 881c84270c81e7e2d26f277199f7712b645921f4 Author: Sascha Wildner Date: Mon Apr 29 18:23:11 2013 +0200 Merge into and remove it. Its only purpose was to define separate CLK_TCK and CLOCKS_PER_SEC per platform, all of which were 128. It also was missing for vkernel64

git: Merge branch 'vendor/DIFFUTILS'

2013-04-23 Thread John Marino
commit 8345d04a2a225978dee6ee4bce453f5a4ce3f9a5 Merge: 6aaf5a4 4536c56 Author: John Marino Date: Tue Apr 23 21:32:32 2013 +0200 Merge branch 'vendor/DIFFUTILS' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/8345d04a2a225978dee6ee4bce453f5a4ce3f9a5 -- Drago

git: Merge branch 'vendor/GREP'

2013-04-23 Thread John Marino
commit b0d125bfe45326a9e897ab7687abb5ce4c41d8a1 Merge: b88b472 a8597f6 Author: John Marino Date: Tue Apr 23 19:53:14 2013 +0200 Merge branch 'vendor/GREP' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/b0d125bfe45326a9e897ab7687abb5ce4c41d8a1 -- DragonFly

git: Merge branch 'vendor/EXPAT'

2013-04-23 Thread John Marino
commit e4cecdc0182eabf09979c198296a88a3e7d6b941 Merge: 6d0e03f fd43634 Author: John Marino Date: Tue Apr 23 15:56:15 2013 +0200 Merge branch 'vendor/EXPAT' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/e4cecdc0182eabf09979c198296a88a3e7d6b941 -- DragonFly

git: Merge branch 'vendor/TNFTP'

2013-04-06 Thread Peter Avalos
commit 6645a7f0837352167745ac38fe9856a8228d7b09 Merge: 69d2955 a83a5d0 Author: Peter Avalos Date: Sat Apr 6 22:00:55 2013 -0700 Merge branch 'vendor/TNFTP' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/6645a7f0837352167745ac38fe9856a8228d7b09 -- DragonFly

git: Merge branch 'master' of git://git.dragonflybsd.org/dragonfly into wlan_serialize

2013-04-01 Thread Sepherosa Ziehau
commit 2267fd784e8a7d1ca13e6d3541caa91f36c9e9fb Merge: ed48190 27a084b Author: Johannes Hofmann Date: Tue Mar 5 17:04:52 2013 +0100 Merge branch 'master' of git://git.dragonflybsd.org/dragonfly into wlan_serialize Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdi

git: Merge branch 'master' of git://git.dragonflybsd.org/dragonfly into wlan_serialize

2013-04-01 Thread Sepherosa Ziehau
commit 88cb131568c551d47f7b04eea6931bff5663ba43 Merge: 4da66bb 4d3eb9a Author: Johannes Hofmann Date: Sat Feb 16 21:50:45 2013 +0100 Merge branch 'master' of git://git.dragonflybsd.org/dragonfly into wlan_serialize Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitd

git: merge

2013-04-01 Thread Sepherosa Ziehau
commit 4da66bbfa353d0fb44e7a3c17f7268748edba48b Merge: 7078f92 4b21dd0 Author: Johannes Hofmann Date: Thu Jan 24 23:06:50 2013 +0100 merge Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4da66bbfa353d0fb44e7a3c17f7268748edba48b -- DragonFly BSD source repos

git: merge

2013-04-01 Thread Sepherosa Ziehau
commit 7078f92bf00cafccd0c0191c7aa92b0bb784f70e Merge: 5b98ac7 ef31a1a Author: Johannes Hofmann Date: Sat Jan 12 11:31:39 2013 +0100 merge Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/7078f92bf00cafccd0c0191c7aa92b0bb784f70e -- DragonFly BSD source repos

git: Merge branch 'vendor/LIBARCHIVE'

2013-02-19 Thread Peter Avalos
commit 6d011315be7569822a952f5a7938300ba4b8c666 Merge: 4e47303 d4d8193 Author: Peter Avalos Date: Tue Feb 19 10:35:19 2013 -0800 Merge branch 'vendor/LIBARCHIVE' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/6d011315be7569822a952f5a7938300ba4b8c666 -- Dra

git: Merge branch 'vendor/OPENSSL'

2013-02-10 Thread Peter Avalos
commit 2aae1984cc020b42d8c92870b19b60db006770a7 Merge: effb40c 9bb344e Author: Peter Avalos Date: Sun Feb 10 01:34:31 2013 -0800 Merge branch 'vendor/OPENSSL' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/2aae1984cc020b42d8c92870b19b60db006770a7 -- Dragon

git: Merge branch 'vendor/OPENSSH'

2012-10-28 Thread Peter Avalos
commit a68c5b03f25445960cc163efb3ffa55195a81af1 Merge: c9e065d 99e85e0 Author: Peter Avalos Date: Sun Oct 28 11:41:45 2012 -0700 Merge branch 'vendor/OPENSSH' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/a68c5b03f25445960cc163efb3ffa55195a81af1 -- Dragon

git: Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly

2012-09-13 Thread Matthew Dillon
commit ee303bb97fa6980b4b82f1cc614aa27e8e5d331a Merge: fb4ca01 dc79700 Author: Matthew Dillon Date: Thu Sep 13 11:38:22 2012 -0700 Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/