Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

openstructure
- Activity
- Members

Snippets Groups Projects

23d9a82e

Commit 23d9a82e authored 13 years ago by Valerio Mariani

Downloads
- Plain Diff

Merge branch 'develop' into ldt

Conflicts:
	modules/gui/src/panels/panel_bar.cc

parents 21903277 16e3bd15

Branches

Tags

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

modules/gui/src/panels/panel_bar.cc 9 additions, 1 deletion

modules/gui/src/panels/panel_bar.cc
modules/gui/src/panels/panel_bar.hh 1 addition, 0 deletions

modules/gui/src/panels/panel_bar.hh
scripts/CMakeLists.txt 2 additions, 1 deletion

scripts/CMakeLists.txt
scripts/ost_config.in 6 additions, 8 deletions

scripts/ost_config.in

with 18 additions and 10 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