Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

CCS project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

ef96256f

Commit ef96256f authored May 23, 2014 by Gabor Csorvasi

Downloads
- Plain Diff

Merge Mod

Conflicts:
	planner/PlannerThread.cpp

parents 0fbae4a8 317dc3cf

No related branches found

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

form/MainWindow.cpp 10 additions, 9 deletions

form/MainWindow.cpp
form/MainWindow.ui 6 additions, 0 deletions

form/MainWindow.ui
planner/PlannerThread.cpp 63 additions, 39 deletions

planner/PlannerThread.cpp
planner/PlannerThread.h 18 additions, 0 deletions

planner/PlannerThread.h
ui_MainWindow.h 5 additions, 0 deletions

ui_MainWindow.h

with 102 additions and 48 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

Hosted with by KSZK