[gawk-diffs] [SCM] gawk branch, master, updated. 44346e48ace060ec46481a77d5c9961e288e288d

[Arnold Robbins]

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 "gawk".

The branch, master has been updated
       via  44346e48ace060ec46481a77d5c9961e288e288d (commit)
       via  8cb65a2e6865322136c6876de4a461331198145d (commit)
       via  422a9f84f8bc91f267a176e737dfc2d7670d540b (commit)
       via  b4997014ca38482c242d84148787ab4211ed6897 (commit)
      from  4e77e3fe3394482ad26b1561fc45a38ca820bf56 (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 -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=44346e48ace060ec46481a77d5c9961e288e288d

commit 44346e48ace060ec46481a77d5c9961e288e288d
Merge: 4e77e3f 8cb65a2
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Feb 6 20:05:06 2013 +0200

    Merge branch 'gawk-4.0-stable'

diff --cc ChangeLog
index a1f59da,5f7f665..887f857
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,14 @@@
  2013-02-06         Arnold D. Robbins     <address@hidden>
  
+       * builtin.c (printf_common): Move nargs > 0 check into assert.
+       (do_sprintf): Add nargs check and fatal message to here.
+ 
++2013-02-04         Arnold D. Robbins     <address@hidden>
++
 +      * main.c (main): Remove undocumented -m option which was for
 +      compatibility with BWK awk. His awk dropped it back in 2007.
 +
- 2013-02-04         Arnold D. Robbins     <address@hidden>
+ 2013-01-31         Arnold D. Robbins     <address@hidden>
  
        * regcomp.c, regex.c, regex_internal.c, regexec.c: Update
        copyright years to sync with GLIBC.
@@@ -16,19 -16,11 +21,25 @@@
        (clean_state_log_if_needed): Likewise.
        (get_subexp): Likewise.`
  
++<<<<<<< HEAD
 +2013-02-03         Arnold D. Robbins     <address@hidden>
 +
 +      * configure.ac: Add Automake test for cross compiling.
 +
++=======
++>>>>>>> gawk-4.0-stable
  2013-01-31         Arnold D. Robbins     <address@hidden>
  
        * dfa.c: Include "dfa.h" which includes regex.h after limits.h
        so that RE_DUP_MAX gets the correct value. Especially needed on
        OpenVMS. Thanks to Anders Wallin.
++<<<<<<< HEAD
 +      * main.c (version): Print out API version numbers if DYNAMIC.
 +      Helpful also for knowing if to run the shlib tests.
 +
 +      * configure: Regenerated after change in m4/readline.m4.
++=======
++>>>>>>> gawk-4.0-stable
  
  2013-01-31         Arnold D. Robbins     <address@hidden>
  

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

Summary of changes:
 ChangeLog |   13 ++++++++++++-
 builtin.c |    9 +++++----
 2 files changed, 17 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
gawk