[tritonus/f14/master: 3/3] Merging master and deleting dead.package (was conflicted)

[lzap]

commit a140dce90b6a7708c86d7ef50be2c6b7e317d1ca
Merge: 707cd7f 4a0a836
Author: Lukas Zapletal <lzap+git at redhat.com>
Date:   Thu Dec 9 07:30:25 2010 +0100

    Merging master and deleting dead.package (was conflicted)

 .gitignore                                   |    1 +
 dead.package                                 |    1 -
 sources                                      |    1 +
 tritonus-configure.in.diff                   |   22 ++
 tritonus-no-jlayer.patch                     |   14 ++
 tritonus-removed-code.diff                   |   35 +++
 tritonus-snapshot.sh                         |   29 +++
 tritonus-src-lib-alsa-cast.patch             |   20 ++
 tritonus-src-lib-alsa-constants_check.h.diff |   15 ++
 tritonus-src-lib-fluidsynth.Makefile.in.diff |   22 ++
 tritonus.spec                                |  299 ++++++++++++++++++++++++++
 11 files changed, 458 insertions(+), 1 deletions(-)
---