* .bzrignore: Add ascii.bitmaps, ascii.h, grub_script.yy.c, and

grub_script.yy.h.

diff --git a/.bzrignore b/.bzrignore
index 46e8637b620652c5ce5298f8877d569c2e7abf4c..aa9c4ff8433e6695a62d7ac5fd8976e8c6c79902 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -3,6 +3,8 @@
 30_os-prober
 40_custom
 aclocal.m4
+ascii.bitmaps
+ascii.h
 autom4te.cache
 build_env.mk
 .bzrignore
@@ -48,6 +50,8 @@ grub_script_check_init.c
 grub_script_check_init.h
 grub_script.tab.c
 grub_script.tab.h
+grub_script.yy.c
+grub_script.yy.h
 grub-set-default
 grub-setup
 grub_setup_init.c

diff --git a/ChangeLog b/ChangeLog
index 15be02a51de57d7a03af98588b31f88b45033d49..e9570905ef7d1fe0870284479a5ee9c58fb54b33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-08  Colin Watson  <cjwatson@ubuntu.com>
+
+       * .bzrignore: Add ascii.bitmaps, ascii.h, grub_script.yy.c, and
+       grub_script.yy.h.
+
 2010-06-08  Colin Watson  <cjwatson@ubuntu.com>
 
        * docs/grub.texi (History): Expand to cover GRUB 2.