Merge branch 'master' into pn532_spi

* master:
  Unify copyright notices & update authors lists
  Update ChangeLog
This commit is contained in:
Philippe Teuwen
2013-03-10 16:17:59 +01:00
74 changed files with 645 additions and 226 deletions

View File

@@ -1,9 +1,13 @@
/*-
* Public platform independent Near Field Communication (NFC) library
* Free/Libre Near Field Communication (NFC) library
*
* Copyright (C) 2009, 2010 Roel Verdult
* Copyright (C) 2010, 2011 Romain Tartière
* Copyright (C) 2009, 2010, 2011, 2012, 2013 Romuald Conty
* Libnfc historical contributors:
* Copyright (C) 2009 Roel Verdult
* Copyright (C) 2009-2013 Romuald Conty
* Copyright (C) 2010-2012 Romain Tartière
* Copyright (C) 2010-2013 Philippe Teuwen
* Copyright (C) 2012-2013 Ludovic Rousseau
* Additional contributors of this file:
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the