Skip to content
Snippets Groups Projects
Commit 5addcbdd authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Merge remote-tracking branch 'jmirabel/devel' into devel 

Conflicts:
	include/gepetto/viewer/corba/windows-manager.hh
	src/graphical-interface.impl.cpp
	src/graphical-interface.impl.hh
	src/windows-manager.cpp
parents feb1ee2d d67c30b2
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 560 additions and 892 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