~ubuntu-branches/ubuntu/trusty/enigma/trusty-proposed

« back to all changes in this revision

Viewing changes to src/gui/OptionsMenu.cc

  • Committer: Package Import Robot
  • Author(s): Erich Schubert
  • Date: 2013-04-06 14:54:02 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20130406145402-jgjrtk7hac8gtvza
Tags: 1.20-dfsg.1-1
* New upstream release (Closes: #704595)
  (Repacked: dropped zipios++ source and main menu music)
* Update watch file, sf.net again.
* Fix documentation links (Closes: #653508)
* Conflict with enigma-level-previews to encourage deinstallation
  (Pregenerated level previews were only used with version 1.01)
* Use dh7 for building instead of CDBS
* Update to policy 3.9.4.0 (no changes)
* Register documentation with doc-base

Show diffs side-by-side

added added

removed removed

Lines of Context:
509
509
            case OPTIONS_AUDIO:
510
510
                OPTIONS_NEW_LB(N_("Sound set: "), new SoundSetButton())
511
511
                OPTIONS_NEW_LB(N_("Menu music: "), new MenuMusicButton)
 
512
                OPTIONS_NEW_LB(N_("Music ingame: "), new InGameMusicButton)
512
513
                OPTIONS_NEW_LB(N_("Sound volume: "), new SoundVolumeButton())
513
514
                OPTIONS_NEW_LB(N_("Music volume: "), new MusicVolumeButton())
514
515
                OPTIONS_NEW_LB(N_("Stereo: "), new StereoButton())
515
 
                //...("Music ingame: ", new InGameMusicButton)
516
516
                break;
517
517
            case OPTIONS_CONFIG:
518
518
                OPTIONS_NEW_LB(N_("Language: "), language = new LanguageButton(this))