Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Thomas Pitiot
CGoGN
Commits
01ed9f51
Commit
01ed9f51
authored
Feb 20, 2015
by
thomas
Browse files
Merge branch 'dev' into develop
Conflicts: .gitignore
parents
fa461dc7
e3f563b2
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
01ed9f51
...
...
@@ -3,6 +3,6 @@ CMakeLists.txt.user
bin/
ThirdParty/bin/
SCHNApps/bin
build
/
ThirdParty/
build/
ThirdParty/include/TinyXml2/
build
ThirdParty/
include/TinyXml2
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment