diff options
| author | Paul Gilbert | 2015-05-31 14:45:10 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-31 14:45:10 -0400 |
| commit | e5296ebf8dd09f603499b1894a33865ec71bb28f (patch) | |
| tree | d7de032efd54dfdb3159cbc778a0c9ce8cd8aa91 /engines/mads/inventory.cpp | |
| parent | 673537bad93f0b440172a0cc263ebf19cc95ffc0 (diff) | |
| parent | 141ff4d08dc24b6bb17098bd71801e2a58e6a38f (diff) | |
| download | scummvm-rg350-e5296ebf8dd09f603499b1894a33865ec71bb28f.tar.gz scummvm-rg350-e5296ebf8dd09f603499b1894a33865ec71bb28f.tar.bz2 scummvm-rg350-e5296ebf8dd09f603499b1894a33865ec71bb28f.zip | |
Merge branch 'master' into phantom
Diffstat (limited to 'engines/mads/inventory.cpp')
| -rw-r--r-- | engines/mads/inventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/mads/inventory.cpp b/engines/mads/inventory.cpp index ca05575ec5..fe1d24baea 100644 --- a/engines/mads/inventory.cpp +++ b/engines/mads/inventory.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * 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, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |