xref: /OpenGrok/opengrok-indexer/src/test/resources/history/git-log-merged-file.txt (revision 6a2061fd153662d4d8d92ee7f634fa3a93edd5f2) 
1commit 4c3d5e8e (from 06b00dcb)
2Merge: 06b00dcb 618516be
3Author: jhb <jhb@FreeBSD.org>
4Date:   Tue Oct 9 15:28:06 2018 +0000
5
6    Update Apache Serf to 1.3.9 to support OpenSSL 1.1.1.
7
8    Approved by:    re (rgrimes)
9
10contrib/serf/STATUS
11
12commit 4c3d5e8e (from 618516be)
13Merge: 06b00dcb 618516be
14Author: jhb <jhb@FreeBSD.org>
15Date:   Tue Oct 9 15:28:06 2018 +0000
16
17    Update Apache Serf to 1.3.9 to support OpenSSL 1.1.1.
18
19    Approved by:    re (rgrimes)
20
21contrib/serf/STATUS
22