Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

CSIP-42
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

b1b21198

Commit b1b21198 authored 3 years ago by Robert Fiko

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	CSIP-42.ThemePark.ViewModel/MainViewModel.cs

parents 66ecba5c 7990cdb1

No related branches found

No related tags found

No related merge requests found

Checking pipeline status

Changes 6
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CSIP-42.ThemePark.View/App.xaml.cs 18 additions, 16 deletions

CSIP-42.ThemePark.View/App.xaml.cs
CSIP-42.ThemePark.View/MainWindow.xaml 0 additions, 64 deletions

CSIP-42.ThemePark.View/MainWindow.xaml
CSIP-42.ThemePark.View/info.xps 2 additions, 2 deletions

CSIP-42.ThemePark.View/info.xps
CSIP-42.ThemePark.ViewModel/DelegateCommand.cs 3 additions, 9 deletions

CSIP-42.ThemePark.ViewModel/DelegateCommand.cs
CSIP-42.ThemePark.ViewModel/MainViewModel.cs 236 additions, 189 deletions

CSIP-42.ThemePark.ViewModel/MainViewModel.cs
CSIP-42.ThemePark.ViewModel/PlacedItem.cs 0 additions, 11 deletions

CSIP-42.ThemePark.ViewModel/PlacedItem.cs

with 259 additions and 291 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