Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix API compatibility of dart 4.3 #309

Merged
merged 9 commits into from
Jan 22, 2015
Merged

Fix API compatibility of dart 4.3 #309

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7844e83
Enables to specify new header name of the deprecated header
jslee02 Jan 21, 2015
f5e890e
Deprecate LCPSolver replaced by ODELCPSolver
jslee02 Jan 21, 2015
0c9b31a
Merge remote-tracking branch 'origin/release-4.3' into release-4.3_fi…
jslee02 Jan 21, 2015
fdca9e8
Fix typo: Gazebo -> DART
jslee02 Jan 21, 2015
c025e3f
Fix typo: ODELCPSolver -> LCPSolver
jslee02 Jan 21, 2015
89534ce
Fix typo: gazebo -> dart
jslee02 Jan 21, 2015
4b95dec
Remove unused header inclusion
jslee02 Jan 22, 2015
5d23b6e
Add more comment on warning message
jslee02 Jan 22, 2015
150f226
Remove unused header inclusion
jslee02 Jan 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/release-4.3' into release-4.3_fi… 
…x_api_compatibility

Conflicts:
	cmake/DARTMacros.cmake
	dart/constraint/CMakeLists.txt
	tools/issue_303_generator.bash
  • Loading branch information
@jslee02
jslee02 committed Jan 21, 2015
commit 0c9b31a1eb483c38d1cae82603c0aab7e62fffbd
1 change: 1 addition & 0 deletions cmake/DARTMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,4 @@ macro(dt_issue_303 _name _output_name)
dt_install_includes(${nameLower} ${generated_file})
endif()
endmacro()

You are viewing a condensed version of this merge commit. You can view the full changes here.