Skip to content
Snippets Groups Projects
Commit ad974115 authored by Dominique Marcadet's avatar Dominique Marcadet
Browse files

Merge branch 'master' into '7-add-needed-services-in-nsdresourceset' 

# Conflicts:
#   fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java
#   fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java
parents 31df1645 7cdf95cd
No related branches found
No related tags found
1 merge request!6Resolve "add needed services in NsdResourceSet"
Hide whitespace changes
Inline Side-by-side
Showing
with 571 additions and 219 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment