Merge branch 'master' into 'master' (4795d24e) · Commits · Di Wang / calypso · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

calypso
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4795d24e

Commit 4795d24e authored 5 years ago by Dave Casper

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Replaced FaserGeoEditor files with latest working version

See merge request faser/calypso!44

parents 101c2c73 94d91bcf

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

DetectorDescription/GeoModel/FaserGeoEditor/README.md 14 additions, 8 deletions

DetectorDescription/GeoModel/FaserGeoEditor/README.md
DetectorDescription/GeoModel/FaserGeoEditor/src/FaserDbMainWindow.cxx 1512 additions, 444 deletions

...ription/GeoModel/FaserGeoEditor/src/FaserDbMainWindow.cxx
DetectorDescription/GeoModel/FaserGeoEditor/src/FaserDbMainWindow.h 37 additions, 10 deletions

...scription/GeoModel/FaserGeoEditor/src/FaserDbMainWindow.h
DetectorDescription/GeoModel/FaserGeoEditor/src/FaserGeoEditorApp.cxx 71 additions, 5 deletions

...ription/GeoModel/FaserGeoEditor/src/FaserGeoEditorApp.cxx
DetectorDescription/GeoModel/FaserGeoEditor/src/FaserGeoEditorApp.h 5 additions, 1 deletion

...scription/GeoModel/FaserGeoEditor/src/FaserGeoEditorApp.h
DetectorDescription/GeoModel/FaserGeoEditor/src/main.cxx 86 additions, 1 deletion

DetectorDescription/GeoModel/FaserGeoEditor/src/main.cxx

with 1725 additions and 469 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