[Pspp-commits] [SCM] GNU PSPP branch, master, updated. v0.6.1-420-g81016c8

[John Darrington]

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 "GNU PSPP".

The branch, master has been updated
       via  81016c80097094353a815f87f68bba672bf17e3e (commit)
       via  8af88c0b7ea2fe75df7e45497988ed0371006a86 (commit)
       via  849f1db3053e27a2879542ffebddb55909ce26ae (commit)
       via  47aaa033c935d0427abd7cbb591a35450eb7db81 (commit)
       via  46b52782d51c442adc7fefe498c5392138f6c9fe (commit)
       via  57166a5a5c4016b83b9a35ac32c219ff853dc9ce (commit)
      from  cdcdc851b79c8f9ddcaaa358a80670bbb21d61f2 (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 81016c80097094353a815f87f68bba672bf17e3e
Author: John Darrington <address@hidden>
Date:   Tue Mar 3 07:40:30 2009 +0900

    Added stock icon to About menuitem

commit 8af88c0b7ea2fe75df7e45497988ed0371006a86
Merge: cdcdc851b79c8f9ddcaaa358a80670bbb21d61f2 
849f1db3053e27a2879542ffebddb55909ce26ae
Author: John Darrington <address@hidden>
Date:   Tue Mar 3 07:12:26 2009 +0900

    Merge branch 'master'; commit 'origin/stable'
    
    Conflicts:
    
        src/math/linreg.h
        src/ui/gui/psppire-data-editor.c

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

Summary of changes:
 src/data/file-name.c               |    1 +
 src/data/sys-file-reader.c         |    9 +++++++--
 src/libpspp/str.c                  |   18 ++++++++++++++++++
 src/libpspp/str.h                  |    6 +++++-
 src/math/linreg.c                  |    1 -
 src/ui/gui/psppire-syntax-window.c |   13 +++++++++----
 6 files changed, 40 insertions(+), 8 deletions(-)


hooks/post-receive
--
GNU PSPP