[Git-commits] some small scripts which should make life easier branch, master, updated. v1.4.2-6-g6ae790e

[git repository hosting]

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 "some small scripts which should make life easier".

The branch, master has been updated
       via  6ae790e9215b65d8394ef3a379f0bdc48474a6c3 (commit)
       via  24eec6fc9a65aafae1390a23988edbe72c4d2153 (commit)
       via  3538df3be1414693af20ba8428e0efb5cfabd63d (commit)
       via  0197b56af074d1f7cc0e388960a8eceae4dd597c (commit)
       via  7c936a9af5db08636db7431a39c418afa95d56f7 (commit)
       via  68552116672d8462fb256c0771888a4654c3687d (commit)
      from  6fb922ca4bc798b9b4b53cb8d2b8df337a51ae63 (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 6ae790e9215b65d8394ef3a379f0bdc48474a6c3
Merge: 6fb922ca4bc798b9b4b53cb8d2b8df337a51ae63 24eec6fc9a65aafae1390a23988edbe72c4d2153
Author: Ulrich Dangel <mru at grml.org>
Date:   Mon Apr 18 23:23:59 2011 +0200

    Merge remote branch 'grml-scripts-split/split/grml-scripts'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	usr_bin/grml-screen

commit 24eec6fc9a65aafae1390a23988edbe72c4d2153
Author: Sebastian Boehm <sebastian at sometimesfood.org>
Date:   Tue Dec 28 14:36:53 2010 +0100

    Only clean compile dir if it exists

commit 3538df3be1414693af20ba8428e0efb5cfabd63d
Author: Sebastian Boehm <sebastian at sometimesfood.org>
Date:   Thu Dec 23 02:06:02 2010 +0100

    Add debian/source/format

commit 0197b56af074d1f7cc0e388960a8eceae4dd597c
Author: Sebastian Boehm <sebastian at sometimesfood.org>
Date:   Thu Dec 23 02:05:05 2010 +0100

    Add automatically generated files to .gitignore

commit 7c936a9af5db08636db7431a39c418afa95d56f7
Author: Sebastian Boehm <sebastian at sometimesfood.org>
Date:   Thu Dec 23 02:12:00 2010 +0100

    Add pointer to grml-scripts-core to description

commit 68552116672d8462fb256c0771888a4654c3687d
Author: Sebastian Boehm <sebastian at sometimesfood.org>
Date:   Thu Dec 23 01:37:12 2010 +0100

    Split grml-scripts into grml-scripts and grml-scripts-core
    
    Move some core packages from grml-scripts to grml-scripts-core:
     - cpu-screen and cpu-screen.sh
     - ip-screen
     - lesspipe.sh
     - code2color
     - grml-screen

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

Summary of changes:
 .gitignore              |    2 +
 compile/.gitignore      |    5 +
 compile/Makefile        |    8 +-
 compile/cpu-screen.c    |  107 --
 compile/ip-screen.c     |   87 --
 debian/.gitignore       |    6 +
 debian/changelog        |    6 +
 debian/control          |   13 +-
 debian/overrides        |    4 -
 debian/rules            |   10 +-
 debian/source/format    |    1 +
 doc/.gitignore          |    2 +
 manpages/grml-scripts.1 |   10 -
 usr_bin/code2color      | 3370 -----------------------------------------------
 usr_bin/cpu-screen.sh   |   34 -
 usr_bin/grml-screen     |   71 -
 usr_bin/lesspipe.sh     |  510 -------
 17 files changed, 32 insertions(+), 4214 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 compile/.gitignore
 delete mode 100644 compile/cpu-screen.c
 delete mode 100644 compile/ip-screen.c
 create mode 100644 debian/.gitignore
 create mode 100644 debian/source/format
 create mode 100644 doc/.gitignore
 delete mode 100755 usr_bin/code2color
 delete mode 100755 usr_bin/cpu-screen.sh
 delete mode 100755 usr_bin/grml-screen
 delete mode 100755 usr_bin/lesspipe.sh


hooks/post-receive
-- 
some small scripts which should make life easier