Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'imbris/fix-optional-names' into 'master'

Browse Source 
Fix optional feature names

See merge request veloren/veloren!505
This commit is contained in:
Imbris 2019-09-21 17:59:26 +00:00
commit f78ab5e86d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
voxygen/src/main.rs
View File

@ -38,9 +38,9 @@ use log::{self, debug, error, info};
use simplelog::{CombinedLogger, Config, TermLogger, TerminalMode, WriteLogger}; use simplelog::{CombinedLogger, Config, TermLogger, TerminalMode, WriteLogger};
use std::{fs::File, mem, panic, str::FromStr}; use std::{fs::File, mem, panic, str::FromStr};
#[cfg(feature = "heaptracking")] #[cfg(feature = "heaptrack")]
use heaptrack::track_mem; use heaptrack::track_mem;
#[cfg(feature = "heaptracking")] #[cfg(feature = "heaptrack")]
track_mem!(); track_mem!();
/// A type used to store state that is shared between all play states. /// A type used to store state that is shared between all play states.
@ -196,7 +196,7 @@ fn main() {
backtrace::Backtrace::new(), backtrace::Backtrace::new(),
); );
#[cfg(feature = "errorbox")] #[cfg(feature = "msgbox")]
msgbox::create("Voxygen has panicked", &msg, msgbox::IconType::ERROR); msgbox::create("Voxygen has panicked", &msg, msgbox::IconType::ERROR);
default_hook(panic_info); default_hook(panic_info);