Merge branch 'master' of http://192.168.10.5:8099/sane/code_lang
This commit is contained in:
commit
8b60fc5047
|
@ -711,7 +711,7 @@ public:
|
|||
return in;
|
||||
}
|
||||
|
||||
int id = get_string_id(in, false);
|
||||
int id = get_string_id(in, !to_def);
|
||||
std::map<uint32_t, std::string>* t = to_def ? &map_default_ : pak_now_;
|
||||
|
||||
if (id == -1)
|
||||
|
|
2451
base_pak.h
2451
base_pak.h
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue