mesa: Changes to 'master'

[Brian Paul]

 progs/beos/.gitignore              |    3 +
 progs/demos/.gitignore             |    2 -
 progs/directfb/.gitignore          |    4 ++
 progs/egl/.gitignore               |    5 ++
 progs/fbdev/.gitignore             |    1 
 progs/fp/.gitignore                |   42 +++++++++++++++++++++++
 progs/glsl/.gitignore              |   10 +++++
 progs/miniglx/.gitignore           |    6 +++
 progs/osdemos/.gitignore           |    8 ++++
 progs/samples/.gitignore           |   32 +++++++++---------
 progs/slang/.gitignore             |    3 +
 progs/tests/.gitignore             |    6 +--
 progs/tools/trace/.gitignore       |    1 
 progs/trivial/.gitignore           |   65 +++++++++++++++++++++++++++++++++++++
 progs/vp/.gitignore                |    1 
 progs/xdemos/.gitignore            |    4 +-
 src/mesa/shader/slang/slang_emit.c |    2 -
 17 files changed, 173 insertions(+), 22 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit b182613f2f537e4425190ab942bb057eeed3ac16
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Sat Sep 29 11:23:22 2007 -0700

    Ignore more generated files in progs/
    
    Many of the directories in progs/ were missing .gitignore files or
    were tracking generated files. This patch is basically the process of
    running `make' in each directory and then finding the untracked files
    with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing
    files were also sorted.

commit 9509afe97cd7d9f58c9b344242171952990abfc8
Merge: 2dbd905... 4599683...
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Oct 9 12:36:56 2007 -0600

    Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

commit 2dbd905ab0265b520efccce24ce9de66b6fc5fb0
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Oct 2 16:50:40 2007 -0600

    fix comment: s/branch/kill/