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

Mac os qt5.14.2 #19

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Mac os qt5.14.2 #19

wants to merge 20 commits into from

Conversation

JulianGro
Copy link
Owner

No description provided.

This reverts commit 24b2cdf.

Conflicts:
	libraries/shared/src/shared/FileUtils.cpp
…rts""

This reverts commit 74b185f.

Conflicts:
	libraries/shared/src/shared/FileUtils.cpp
…_COPY (or Q_DISABLE_COPY_MOVE)"

This reverts commit 57a3cd3.

Conflicts:
	interface/src/avatar/MyHead.h
	libraries/networking/src/NodeList.h
… the existing code)"

This reverts commit c88b7f6.

Conflicts:
	interface/src/avatar/MyHead.h
This reverts commit aabcdea, reversing
changes made to 57167cd.

# Conflicts:
#	libraries/networking/src/NodeList.h
Dies reverted den Commit ad7f885.
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.

1 participant