Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.10 -> master #4299

Merged
merged 33 commits into from
Feb 9, 2019
Merged

3.10 -> master #4299

merged 33 commits into from
Feb 9, 2019

Conversation

nhthn
Copy link
Contributor

@nhthn nhthn commented Feb 9, 2019

No description provided.

scztt and others added 30 commits July 12, 2018 20:42
This fixes issues where server menu flashes when updating because we were detroying the entire thing to rebuild it - now we just incrementally update.
fixes #3352; previously would cause bad behavior with escaped double quotes
inside strings and escaped single quotes inside symbols.
sclang: fix string/symbol lexing
…-std-move

remove unnecessary std::move according to clang 8.0 compiler warnings
…-variables-and-functions

Fixes/remove unnecessary variables and functions
main menu: remove Ctrl+B shortcut when server is running
main menu: don't init menu actions in initClass; document
@nhthn nhthn added this to the 3.10.2 milestone Feb 9, 2019
@nhthn nhthn merged commit 834c036 into master Feb 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants