summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorrbalocca <rbalocca@vyatta.com>2008-06-29 18:05:08 -0700
committerrbalocca <rbalocca@vyatta.com>2008-06-29 18:05:08 -0700
commit7db066e99a5e9c3b41ce30d19b9781b1a8df8d44 (patch)
tree75da49d74a9da7cb6df98651ef511ddd12a42790 /.gitignore
parentdd1921164c972be0333d8b90f7c12f31f67a136e (diff)
parent3b1043be67c60220c107e42998635c628eb84393 (diff)
downloadvyatta-cfg-7db066e99a5e9c3b41ce30d19b9781b1a8df8d44.tar.gz
vyatta-cfg-7db066e99a5e9c3b41ce30d19b9781b1a8df8d44.zip
Merge branch 'hollywood'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 765492c..f58bf72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ libtool
/aclocal.m4
/autom4te.cache
/build-stamp
-/ChangeLog
/config
/config.log
/config.guess
@@ -21,6 +20,7 @@ libtool
/debian/vyatta-cfg
/debian/vyatta-cfg.postinst
/debian/vyatta-cfg.postrm
+/debian/vyatta-cfg.debhelper.log
/INSTALL
/Makefile.in
/Makefile