[Pspp-commits] [SCM] GNU PSPP branch, master, updated. v0.6.1-294-ga1efcf9

[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  a1efcf97ca2f75f4be6a0389ff2372c03ed2d4e1 (commit)
       via  056009fe999768b37cba5e12e9fef9901c856d6a (commit)
       via  7d16c03ab0d8d9999f1756b8c6054507d3d86f0d (commit)
       via  df7e825aff8143a6624899a4594707fafb1ad82f (commit)
       via  8ad1e4376c6928b472511016dcab636a21f6d413 (commit)
       via  2fb98b792ed39c7b39dbd6325e933c612c277000 (commit)
       via  9da91f0b58bb3518f2642af932c3a45b63863274 (commit)
       via  0d99288ed69fa139ac9fbeccb072dc697c1ed740 (commit)
       via  80cc751377f06abdf4b9019dae2acce0ebfbb259 (commit)
      from  486e95574d796cd1ce703aff4bc5b8f9f3021333 (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 a1efcf97ca2f75f4be6a0389ff2372c03ed2d4e1
Merge: 486e95574d796cd1ce703aff4bc5b8f9f3021333 
056009fe999768b37cba5e12e9fef9901c856d6a
Author: John Darrington <address@hidden>
Date:   Sat Jan 17 11:47:25 2009 +0900

    Merge commit 'origin/stable'
    
    Conflicts:
    
        src/language/utilities/include.c
        src/ui/terminal/automake.mk
        tests/command/insert.sh

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

Summary of changes:
 Smake                            |    1 +
 configure.ac                     |    4 +
 po/en_GB.po                      |  735 +++++++++++++++++++-------------------
 src/data/file-name.c             |   42 +++
 src/data/file-name.h             |    2 +
 src/language/command.def         |    4 +-
 src/language/stats/crosstabs.q   |    2 +-
 src/language/utilities/include.c |    9 +
 src/libpspp/automake.mk          |    2 +-
 src/output/journal.c             |    6 +-
 src/ui/gui/automake.mk           |    1 +
 src/ui/gui/output-viewer.c       |   23 +-
 src/ui/gui/output-viewer.h       |    3 +-
 src/ui/gui/psppire.c             |   24 +-
 src/ui/terminal/automake.mk      |    2 +-
 tests/command/insert.sh          |   19 +
 16 files changed, 489 insertions(+), 390 deletions(-)


hooks/post-receive
--
GNU PSPP