Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

JPSeditor
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

0c194701

There was a problem fetching the pipeline summary.

Commit 0c194701 authored May 16, 2018 by Mohcine Chraibi

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

Develop into Master

See merge request !8

parents 5bed068f fbe101fb

No related branches found

No related tags found

1 merge request!8Develop into Master

Pipeline #

Changes 12
Pipelines 1

Expand all Show whitespace changes

Inline Side-by-side

Showing

.gitignore 0 additions, 7 deletions

.gitignore
.gitlab-ci.yml 2 additions, 0 deletions

.gitlab-ci.yml
CHANGELOG.md 14 additions, 3 deletions

CHANGELOG.md
README.md 23 additions, 38 deletions

README.md
forms/mainwindow.ui 1 addition, 1 deletion

forms/mainwindow.ui
jpseditor.pro.user 0 additions, 508 deletions

jpseditor.pro.user
src/GraphicView.cpp 34 additions, 0 deletions

src/GraphicView.cpp
src/GraphicView.h 1 addition, 0 deletions

src/GraphicView.h
src/graphicscene.cpp 11 additions, 0 deletions

src/graphicscene.cpp
src/mainWindow.cpp 52 additions, 7 deletions

src/mainWindow.cpp
src/mainWindow.h 5 additions, 0 deletions

src/mainWindow.h
src/rooms.cpp 9 additions, 9 deletions

src/rooms.cpp

with 152 additions and 573 deletions

Loading

0% Loading or .

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

Finish editing this message first!

Please sign in to comment