Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

[lilypond.git] / THANKS

diff --git a/THANKS b/THANKS
index cf2c2e3361bd12c0314bf80728e677edbb88c3ef..38623616d3e9f0a7703e42120e7dcfd69067204a 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,18 +1,22 @@
-Release 2.9
-***********
+Release 2.10
+************
+
 
 DEVELOPMENT TEAM
 
 Han-Wen Nienhuys  - Core development
 Jan Nieuwenhuizen - Core development
-Graham Percival   - Documentation Editor
+Graham Percival   - Documentation Editor and Bug Meister
 Mats Bengtsson    - Support Guru 
 
+
 CONTRIBUTORS
 
+Angelo Contardi
 David Feuer
 Erik Sandberg
 Erlend Aasland
+Guido Amoruso
 Heikki Junes
 Joe Neeman
 
@@ -20,14 +24,19 @@ Joe Neeman
 SPONSORS
 
 Andrew Sidwell
+Anthony Youngman 
 Chris Sawer
+David Griffel
 Jamie Bullock
+Kieren MacMillan
 Michael Meixner 
+Paul Scott
+Rick Hansen
 Steve Doonan
 Trent Johnston
 Trevor Bača
 Vivian Barty-Taylor
-
+William Wilson
 
 DOCUMENTATION HELPERS
 
@@ -42,40 +51,63 @@ Juergen Reuter
 BUG HUNTERS/SUGGESTIONS
 
 Albert Frantz
+Arvid Grøtting
 Anthony Youngman
 Aurèle Duda
+Ben Hoefer
 Bernie Arai
 Cameron Horsburgh
+Charles Cave
 Christian Hitz
 Christopher Ellis
 Claude Routhier
 Colin Wilding
+Daniel Tonda Castillo
 David Rogers
 Francisco Vila
 Harald Wellmann
+Henrik Frisk
+Hernán J. González 
+Johannes Schindelin
+John Williams
 J. Leung
-<<<<<<< THANKS
-Harald Wellmann
 Karim Haddad
-=======
->>>>>>> 1.238
 Karl Hammar
 Keith Packard
+Kieren MacMillan
+Lee T. Wilkirson
+Lieke van der Meer
+Luc Wehli
+Manuzhai
 Mark Dewey
+Marcus Macauley
 Markus Schneider
+Matti Aaltonen
 Michael Meixner
+Michael Welsh Duggan
+Milan Zamazal
 Orm Finnendahl
+Paul Scott
+Phillip Kirlin
 Quentin Spencer
 Rainer Typke
 Rick Hansen
+Rutger Helmers
 Ruud van Silfhout
 Sietse Brouwer
 Stephen Carter
 Stephen Kress
 Thies Albrecht
+Toine Schreurs
 Trent Johnston
+Trevor Bača
+Trevor Daniels
 Vaclav Smilauer
+Vicente Solsona Dellá
+Victor Eijkhout
+Villum Sejersen
 Werner Lemberg
+Will Oram
 Zoltan V. Laszlo
 
 Release 2.8
@@ -173,7 +205,7 @@ Patrick K Welton
 Paul Scott
 Ralph Little
 Richard Schoeller
-Robert Vlatasy
+Robert Vlasaty
 Roman Kurakin
 Russell Lang
 Scott Russell
@@ -407,7 +439,7 @@ Pawel D
 Pedro Kroger
 Ray McKinney
 Reuben Thomas
-Robert Vlatasy
+Robert Vlasaty
 Stef Epardaud
 Thomas Willhalm
 Thomas Scharkowski