[Scummvm-cvs-logs] scummvm master -> c824ef16a69387570a86aa9b6c62e10690fa549c

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c824ef16a6 Merge branch 'master' of https://github.com/enginmanap/scummvm


Commit: c824ef16a69387570a86aa9b6c62e10690fa549c
    https://github.com/scummvm/scummvm/commit/c824ef16a69387570a86aa9b6c62e10690fa549c
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-04-17T12:44:29-07:00

Commit Message:
Merge branch 'master' of https://github.com/enginmanap/scummvm

Changed paths:
    gui/options.cpp
    gui/options.h