Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Hagraah Pendu
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

34d68781

Commit 34d68781 authored 2 years ago by Sofiane Lasri

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/origin/main'

Conflicts:
	Pendu.xcodeproj/project.pbxproj
	Pendu/GameEngine.swift

parents f6ac7b16 9585d309

Branches

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

.DS_Store 0 additions, 0 deletions

.DS_Store
Pendu.xcodeproj/project.pbxproj 4 additions, 0 deletions

Pendu.xcodeproj/project.pbxproj
Pendu/Base.lproj/Main.storyboard 86 additions, 5 deletions

Pendu/Base.lproj/Main.storyboard
Pendu/GameEngine.swift 11 additions, 6 deletions

Pendu/GameEngine.swift
Pendu/ViewController.swift 26 additions, 0 deletions

Pendu/ViewController.swift
PenduTests/PenduTests.swift 1 addition, 1 deletion

PenduTests/PenduTests.swift

with 128 additions and 12 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