Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

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

Snippets Groups Projects

50c36b27

Commit 50c36b27 authored 6 years ago by ariotte

Downloads
- Plain Diff

Merge branch 'dev2018' of https://github.com/eiimage/eiimage into dev2018

parents 936c1f4f ce92b2c3

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/CMakeLists.txt 2 additions, 3 deletions

app/CMakeLists.txt
app/Operations/HoughDialog.ui 11 additions, 8 deletions

app/Operations/HoughDialog.ui
app/Operations/UCharConvertDialog.cpp 76 additions, 0 deletions

app/Operations/UCharConvertDialog.cpp
app/Operations/UCharConvertDialog.h 14 additions, 3 deletions

app/Operations/UCharConvertDialog.h
app/Operations/UCharConvertOp.cpp 22 additions, 13 deletions

app/Operations/UCharConvertOp.cpp
app/Operations/UCharConvertOp.h 4 additions, 3 deletions

app/Operations/UCharConvertOp.h
app/Operations/ucharconvertdialog.cpp 0 additions, 14 deletions

app/Operations/ucharconvertdialog.cpp
app/Operations/ucharconvertdialog.ui 0 additions, 112 deletions

app/Operations/ucharconvertdialog.ui

with 129 additions and 156 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