<feed xmlns='http://www.w3.org/2005/Atom'>
<title>src-test2/crypto/openssh/cipher.c, branch release/7.3.0_cvs</title>
<subtitle>FreeBSD source tree</subtitle>
<id>https://cgit-dev.freebsd.org/src-test2/atom?h=release%2F7.3.0_cvs</id>
<link rel='self' href='https://cgit-dev.freebsd.org/src-test2/atom?h=release%2F7.3.0_cvs'/>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src-test2/'/>
<updated>2006-09-30T13:38:06Z</updated>
<entry>
<title>Merge conflicts.</title>
<updated>2006-09-30T13:38:06Z</updated>
<author>
<name>Dag-Erling Smørgrav</name>
<email>des@FreeBSD.org</email>
</author>
<published>2006-09-30T13:38:06Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src-test2/commit/?id=333ee03933b2892718b59734cd7dd3608b6caf1a'/>
<id>urn:sha1:333ee03933b2892718b59734cd7dd3608b6caf1a</id>
<content type='text'>
MFC after:	1 week
</content>
</entry>
<entry>
<title>Merge conflicts.</title>
<updated>2006-03-22T20:41:37Z</updated>
<author>
<name>Dag-Erling Smørgrav</name>
<email>des@FreeBSD.org</email>
</author>
<published>2006-03-22T20:41:37Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src-test2/commit/?id=b74df5b26fa43e05a034a6ce662dcf286a1ffdd9'/>
<id>urn:sha1:b74df5b26fa43e05a034a6ce662dcf286a1ffdd9</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Resolve conflicts.</title>
<updated>2005-09-03T07:04:25Z</updated>
<author>
<name>Dag-Erling Smørgrav</name>
<email>des@FreeBSD.org</email>
</author>
<published>2005-09-03T07:04:25Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src-test2/commit/?id=d4ecd1085791f1e31b106a2546b08647fd6a2a17'/>
<id>urn:sha1:d4ecd1085791f1e31b106a2546b08647fd6a2a17</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Resolve conflicts.</title>
<updated>2005-06-05T15:46:09Z</updated>
<author>
<name>Dag-Erling Smørgrav</name>
<email>des@FreeBSD.org</email>
</author>
<published>2005-06-05T15:46:09Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src-test2/commit/?id=aa49c9264c97095f0d273288be7cb0b4b06658ab'/>
<id>urn:sha1:aa49c9264c97095f0d273288be7cb0b4b06658ab</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Resolve conflicts</title>
<updated>2004-10-28T16:11:31Z</updated>
<author>
<name>Dag-Erling Smørgrav</name>
<email>des@FreeBSD.org</email>
</author>
<published>2004-10-28T16:11:31Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src-test2/commit/?id=21e764df0c8084af2d7d6f5ecdaa136ad81246ed'/>
<id>urn:sha1:21e764df0c8084af2d7d6f5ecdaa136ad81246ed</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Resolve conflicts.</title>
<updated>2004-02-26T10:52:33Z</updated>
<author>
<name>Dag-Erling Smørgrav</name>
<email>des@FreeBSD.org</email>
</author>
<published>2004-02-26T10:52:33Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src-test2/commit/?id=1ec0d7542954a002634c04e1fd0d00520b0f5511'/>
<id>urn:sha1:1ec0d7542954a002634c04e1fd0d00520b0f5511</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Resolve conflicts and remove obsolete files.</title>
<updated>2004-01-07T11:16:27Z</updated>
<author>
<name>Dag-Erling Smørgrav</name>
<email>des@FreeBSD.org</email>
</author>
<published>2004-01-07T11:16:27Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src-test2/commit/?id=cf2b5f3b6d88690d9dee1824ed589d164bb62abc'/>
<id>urn:sha1:cf2b5f3b6d88690d9dee1824ed589d164bb62abc</id>
<content type='text'>
Sponsored by:	registrar.no
</content>
</entry>
<entry>
<title>Remove RCSID from files which have no other diffs to the vendor branch.</title>
<updated>2003-05-01T15:05:43Z</updated>
<author>
<name>Dag-Erling Smørgrav</name>
<email>des@FreeBSD.org</email>
</author>
<published>2003-05-01T15:05:43Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src-test2/commit/?id=d12c7b01da4ef1aea5c4f7e4b06fff97d8b33bd1'/>
<id>urn:sha1:d12c7b01da4ef1aea5c4f7e4b06fff97d8b33bd1</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Resolve conflicts.</title>
<updated>2003-04-23T17:13:13Z</updated>
<author>
<name>Dag-Erling Smørgrav</name>
<email>des@FreeBSD.org</email>
</author>
<published>2003-04-23T17:13:13Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src-test2/commit/?id=e73e9afa91f5b9a483863ad8e01f6843c8e11fcb'/>
<id>urn:sha1:e73e9afa91f5b9a483863ad8e01f6843c8e11fcb</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Resolve conflicts.</title>
<updated>2002-10-29T10:16:02Z</updated>
<author>
<name>Dag-Erling Smørgrav</name>
<email>des@FreeBSD.org</email>
</author>
<published>2002-10-29T10:16:02Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src-test2/commit/?id=f388f5ef2694c14a9c45d0b328d12bdc2c2e6d83'/>
<id>urn:sha1:f388f5ef2694c14a9c45d0b328d12bdc2c2e6d83</id>
<content type='text'>
</content>
</entry>
</feed>
