* lily/spacing-spanner.cc (calc_common_shortest_duration): use

[lilypond.git] / THANKS

diff --git a/THANKS b/THANKS
index e7d3b59422af0478fe44d2e011efd270091f6901..0fe6f802f2272e99f67e569577420c8fad5c1f67 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,13 +10,14 @@ Mats Bengtsson    - Support Guru
 
 CONTRIBUTORS
 
+Angelo Contardi
 David Feuer
 Erik Sandberg
 Erlend Aasland
+Guido Amoruso
 Heikki Junes
 Joe Neeman
 
-
 SPONSORS
 
 Andrew Sidwell
@@ -46,6 +47,7 @@ Anthony Youngman
 Aurèle Duda
 Bernie Arai
 Cameron Horsburgh
+Charles Cave
 Christian Hitz
 Christopher Ellis
 Claude Routhier
@@ -54,18 +56,16 @@ David Rogers
 Francisco Vila
 Harald Wellmann
 J. Leung
-<<<<<<< THANKS
-Harald Wellmann
 Karim Haddad
-=======
->>>>>>> 1.238
 Karl Hammar
 Keith Packard
+Kieren MacMillian
 Lee T. Wilkirson
 Mark Dewey
 Markus Schneider
 Michael Meixner
 Orm Finnendahl
+Paul Scott
 Quentin Spencer
 Rainer Typke
 Rick Hansen
@@ -174,7 +174,7 @@ Patrick K Welton
 Paul Scott
 Ralph Little
 Richard Schoeller
-Robert Vlatasy
+Robert Vlasaty
 Roman Kurakin
 Russell Lang
 Scott Russell
@@ -408,7 +408,7 @@ Pawel D
 Pedro Kroger
 Ray McKinney
 Reuben Thomas
-Robert Vlatasy
+Robert Vlasaty
 Stef Epardaud
 Thomas Willhalm
 Thomas Scharkowski