Merge [2058] and [2059] from trunk.

svn path=/branches/yasm-0.7.x/; revision=2060

diff --git a/COPYING b/COPYING
index 5e9221f9d0b5e7dee29ffa80d8fa6f769227bff0..7a44c8d6a64bff4496e61120928486809e75fc63 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Yasm is Copyright (c) 2001-2007 Peter Johnson and other Yasm developers.
+Yasm is Copyright (c) 2001-2008 Peter Johnson and other Yasm developers.
 
 Yasm developers and/or contributors include:
   Peter Johnson

diff --git a/HACKING b/HACKING
index bc85acc5b0f47b7cabe3c52ca0ad4dfb73da951d..3980f56062fb2ba9b5662658d592197472463bd6 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -66,7 +66,7 @@ requires in a packaged distribution.  Programs required:
   * m4
   * gettext
   * make (GNU preferred)
-  * bison
+  * Python
   * gcc
 
 To rebuild the manpages from the DocBook XML files, the program "xmlto" and

diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index 475d2ba883aa2cada508cba0fd05461b46b96209..8c24d285aad1be29a40d08a738f14cc8895f6741 100644 (file)
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -194,7 +194,7 @@ static opt_option options[] =
 /*@observer@*/ static const char *version_msg[] = {
     PACKAGE_NAME " " PACKAGE_INTVER "." PACKAGE_BUILD,
     "Compiled on " __DATE__ ".",
-    "Copyright (c) 2001-2007 Peter Johnson and other Yasm developers.",
+    "Copyright (c) 2001-2008 Peter Johnson and other Yasm developers.",
     "Run yasm --license for licensing overview and summary."
 };