Merge branch 'rr1-maint'

This commit is contained in:
Ilari Liusvaara 2013-01-18 19:21:44 +02:00
commit b2be07750f
2 changed files with 33 additions and 0 deletions

View file

@ -1,3 +1,19 @@
/*************************************************************************
* Copyright (C) 2011-2013 by Ilari Liusvaara *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
#include "lsnes.hpp"
#include <sstream>
#include <map>

View file

@ -1,3 +1,20 @@
/***************************************************************************
* Copyright (C) 2012-2013 by Ilari Liusvaara *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License version 2 as *
* published by the Free Software Foundation. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License version 2 for more details. *
* *
* You should have received a copy of the GNU General Public License *
* version 2 along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "lsnes.hpp"
#include <sstream>
#include <iostream>