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

Marker id to string #576

Closed
wants to merge 19 commits into from
Closed

Marker id to string #576

wants to merge 19 commits into from

Conversation

schaumb
Copy link
Contributor

@schaumb schaumb commented Sep 10, 2024

No description provided.

# Conflicts:
#	test/e2e/test_cases/test_cases.json
…labels' into markerId-to-string

# Conflicts:
#	CHANGELOG.md
#	src/apps/weblib/cinterface.cpp
#	src/base/conv/auto_json.h
#	src/base/gfx/draw/textbox.cpp
#	src/base/gfx/font.cpp
#	src/base/style/paramregistry.h
#	src/chart/generator/plotbuilder.cpp
#	src/chart/main/events.h
#	src/dataframe/impl/dataframe.cpp
#	src/dataframe/impl/dataframe.h
#	src/dataframe/interface.h
#	src/dataframe/old/types.h
#	test/e2e/test_cases/test_cases.json
#	test/e2e/tests/features.json
#	test/e2e/tests/fixes.json
#	test/qtest/chart.cpp
…markerId-to-string

# Conflicts:
#	CHANGELOG.md
#	src/base/gfx/canvas.h
#	src/chart/main/events.h
#	src/chart/rendering/drawlegend.cpp
#	test/e2e/tests/features.json
#	test/e2e/tests/fixes.json
#	test/e2e/tests/style_tests.json
#	test/unit/chart/events.cpp
…nto markerId-to-string

# Conflicts:
#	CHANGELOG.md
@schaumb schaumb closed this Sep 10, 2024
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