[openssh-commits] CVS: fuyu.mindrot.org: openssh

[Damien Miller]

CVSROOT:        /var/cvs
Module name:    openssh
Changes by:     djm at fuyu.mindrot.org 14/05/27 14:27:02

Modified files:
    .               : ChangeLog cipher.c

Log message:
 - (djm) [cipher.c] Fix merge botch.

Diff commands:
cvs -nQq rdiff -u -r1.6825 -r1.6826 openssh/ChangeLog
cvs -nQq rdiff -u -r1.105 -r1.106 openssh/cipher.c

ViewVC:
http://anoncvs.mindrot.org/index.cgi/openssh/ChangeLog?r1=1.6825;r2=1.6826&view=patch
http://anoncvs.mindrot.org/index.cgi/openssh/cipher.c?r1=1.105;r2=1.106&view=patch

Please note that there may be a delay before commits are available
on the public ViewVC site.