From: Peter Johnson <peter@tortall.net>
Date: Sat, 12 Apr 2008 01:18:02 +0000 (-0000)
Subject: Merge [2058] and [2059] from trunk.
X-Git-Tag: v0.7.0~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea23c1e2b9f27169ec0cfa49d22cea30b25ca2ab;p=yasm

Merge [2058] and [2059] from trunk.

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

diff --git a/COPYING b/COPYING
index 5e9221f9..7a44c8d6 100644
--- 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 bc85acc5..3980f560 100644
--- 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 475d2ba8..8c24d285 100644
--- 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."
 };