Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

OpenFlipper
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

00070be5

Commit 00070be5 authored 1 month ago by Daniel Savchenko

Downloads
- Patches
- Plain Diff

clean merge conflicts

parent 9fe2ea2a

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Core/Core.cc 16 additions, 18 deletions

Core/Core.cc
LicenseManager/keyGen/keygenWidget.cc 24 additions, 21 deletions

LicenseManager/keyGen/keygenWidget.cc
PythonInterpreter/PythonInterpreter.cc 3 additions, 3 deletions

PythonInterpreter/PythonInterpreter.cc
cmake/CMakeLists.txt 0 additions, 2 deletions

cmake/CMakeLists.txt
libs_required/ACG/CMakeLists.txt 1 addition, 1 deletion

libs_required/ACG/CMakeLists.txt
tests/CMakeLists.txt 1 addition, 1 deletion

tests/CMakeLists.txt
tests/run_tests.py 1 addition, 1 deletion

tests/run_tests.py
widgets/glWidget/QtBaseViewer.cc 2 additions, 0 deletions

widgets/glWidget/QtBaseViewer.cc

with 48 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment