RELEASE: Grammer

--HG--
extra : convert_revision : f9ad0ea469aaf6ec059bd50db0cc5d956c354e2c

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 50ab6b330588a1393fb11807e011aa2fac122977..cd62fb86bdc9ace452b5283c555b276a1b12a7a2 100644 (file)
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -35,8 +35,8 @@ Possible Incompatibilities:
    To see how to add your sources take a look at one of them.
 3. Python is now used to created the parameter structs that were created
    manually before. The parameters listed in a py file are turned into 
-   a header file with the same name (e.g. BadDevice.py -> BadDevice.h). 
-   With this change the structs can be populate automatically and the 
+   a header file with the same name (e.g. BadDevice.py -> BadDevice.hh). 
+   With this change the structs can be populated automatically and the 
    ugly macros to define and create SimObjects at the bottem of source
    files are gone. The parameter structs also automatically inherit 
    parameters from their parents. 

diff --git a/util/make_release.py b/util/make_release.py
index 891f57cc5b5323d49ac17a50599863f0fb625678..c7e56f1cf696821de6c5d747d3c6ed38434cbd6a 100755 (executable)
--- a/util/make_release.py
+++ b/util/make_release.py
@@ -199,7 +199,7 @@ def replace_line(s_regex, f, rl):
 remove_sources(r'.*nativetrace.*', 'src/cpu')
 
 remove_lines(r'.*X86.*', None,  'src/arch/isa_specific.hh')
-remove_lines(r'.*X86.*', None,  'src/base/traceflags.py')
+#remove_lines(r'.*X86.*', None,  'src/base/traceflags.py')
 remove_lines(r'.*X86.*', None,  'AUTHORS')
 remove_lines(r'.*X86.*', None,  'src/base/loader/object_file.hh')
 remove_lines(r'.*_X86_.*', '.*else.*', 'src/base/loader/elf_object.cc')