[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc2-5-gfa1cfc2

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  fa1cfc2d4da808f752518d3221619bc2e1ea628b (commit)
      from  58699923148fa1e0bc3eee4308e351cedecf296a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fa1cfc2d4da808f752518d3221619bc2e1ea628b
Author: Øyvind Harboe <oyv...@zy...>
Date:   Mon Feb 15 13:41:08 2010 +0100

    gpl: fix GPL startup message
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/helper/options.c b/src/helper/options.c
index 63c5b05..3a95df4 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -190,7 +190,7 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])
 
 	if (help_flag)
 	{
-		LOG_OUTPUT("Open On-Chip Debugger\n(c) 2005-2008 by Dominic Rath\n\n");
+		LOG_OUTPUT("Open On-Chip Debugger\nLicensed under GNU GPL v2\n");
 		LOG_OUTPUT("--help       | -h\tdisplay this help\n");
 		LOG_OUTPUT("--version    | -v\tdisplay OpenOCD version\n");
 		LOG_OUTPUT("--file       | -f\tuse configuration file <name>\n");
diff --git a/src/openocd.c b/src/openocd.c
index 1105d2a..a689d59 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -228,7 +228,8 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
 	}
 	LOG_DEBUG("command registration: complete");
 
-	LOG_OUTPUT(OPENOCD_VERSION "\n");
+	LOG_OUTPUT(OPENOCD_VERSION "\n"
+			"Licensed under GNU GPL v2\n");
 
 	global_cmd_ctx = cmd_ctx;
 

-----------------------------------------------------------------------

Summary of changes:
 src/helper/options.c |    2 +-
 src/openocd.c        |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository