From: Ivan Maidanski <ivmai@mail.ru>
Date: Sun, 17 May 2015 18:03:22 +0000 (+0300)
Subject: Merge branch 'profiling-callbacks'
X-Git-Tag: gc7_6_0~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7aba59b5853330c9368bc16dd606e1617c704334;p=gc

Merge branch 'profiling-callbacks'
---

7aba59b5853330c9368bc16dd606e1617c704334
diff --cc AUTHORS
index c4bb8d38,4b070aaf..19bc1c92
--- a/AUTHORS
+++ b/AUTHORS
@@@ -217,9 -214,9 +217,10 @@@ Laurent Morichetti <l_m@pacbell.net
  Linas Vepstas <linasvepstas@gmail.com>
  Loren J. Rittle <rittle@latour.labs.mot.com>
  Louis Zhuang <louis.zhuang@acm.org>
+ Lucas Meijer <lucas@unity3d.com>
  Ludovic Courtes <ludo@gnu.org>
  Maarten Thibaut <mthibaut@cisco.com>
 +Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>
  Manuel Serrano <serrano@cornas.inria.fr>
  Marc Recht <recht@netbsd.org>
  Marco Maggi <marco.maggi-ipsu@poste.it>