Skip to content
GitLab
Explore
Sign in
SDK
Umbrello
Repository
umbrello
umbrello
assocrules.cpp
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/Applications/16.12'
· bd1f2fd4
Ralf Habacker
authored
Mar 13, 2017
# Conflicts: # CMakeLists.txt # umbrello/uml1model/umlobject.cpp
bd1f2fd4