From dd1f9b307eb0ab746a9cbd391511dbf646f29210 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 17 Sep 2006 08:05:03 +1000
Subject: [PATCH]  - (djm) Add openssh.xml to .cvsignore and sort it

---
 .cvsignore | 43 ++++++++++++++++++++++---------------------
 ChangeLog  |  3 ++-
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1f98baa3b..b893c972d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,28 +1,29 @@
-ssh
+*.0
+*.out
+Makefile
+autom4te.cache
+buildit.sh
+buildpkg.sh
+config.cache
+config.h
+config.h.in
+config.log
+config.status
+configure
+openssh.xml
+opensshd.init
 scp
-sshd
+sftp
+sftp-server
+ssh
 ssh-add
+ssh-agent
 ssh-keygen
 ssh-keyscan
 ssh-keysign
-ssh-agent
-sftp-server
-sftp
-configure
-config.h.in
-config.h
-config.status
-config.cache
-config.log
-stamp-h.in
-Makefile
-ssh_prng_cmds
-*.out
-*.0
-buildit.sh
-buildpkg.sh
-autom4te.cache
 ssh-rand-helper
-survey.sh
+ssh_prng_cmds
+sshd
+stamp-h.in
 survey
-opensshd.init
+survey.sh
diff --git a/ChangeLog b/ChangeLog
index 3c00fec48..310375711 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
      limit maximum work performed by the CRC compensation attack detector,
      problem reported by Tavis Ormandy, Google Security Team;
      ok markus@ deraadt@
+ - (djm) Add openssh.xml to .cvsignore and sort it
 
 20060912
  - (djm) [Makefile.in buildpkg.sh.in configure.ac openssh.xml.in]
@@ -5441,4 +5442,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4545 2006/09/16 20:08:53 djm Exp $
+$Id: ChangeLog,v 1.4546 2006/09/16 22:05:03 djm Exp $