diff options
| author | Reid <reidyaro@gmail.com> | 2012-01-30 15:27:30 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-01-30 15:27:30 +0100 |
| commit | 502a0a0163e702af7334979a2eabfc4826a94091 (patch) | |
| tree | 5e80ef76585b1718d7e74a411117c725fe3cb0e9 /src/mumblemanager.cpp | |
| parent | 8dea62750ab3a44e0f35f2543bbb6ccf2a9470ce (diff) | |
| parent | 193ea898e5f549c14c0e4cd0d060785de4fb4bcf (diff) | |
| download | manaplus-502a0a0163e702af7334979a2eabfc4826a94091.tar.gz manaplus-502a0a0163e702af7334979a2eabfc4826a94091.tar.bz2 manaplus-502a0a0163e702af7334979a2eabfc4826a94091.tar.xz manaplus-502a0a0163e702af7334979a2eabfc4826a94091.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/mumblemanager.cpp')
| -rw-r--r-- | src/mumblemanager.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp index 766f4085e..14ca7d527 100644 --- a/src/mumblemanager.cpp +++ b/src/mumblemanager.cpp @@ -78,7 +78,6 @@ void MumbleManager::init() #if defined BSD4_4 return; #endif - if (mLinkedMem || !config.getBoolValue("enableMumble")) return; |