Resolved conflict with autogenerated code
Concerning #598: Fixed bug (interdependent auxiliary functions)
A bit of cleanup in code_generator header.
automatic documentation update
Merge branch 'develop' of github.com:casadi/casadi into develop
Some changes to CMakeLists.txt to make compatible with CMake 2.6.0
Implemented missing updateNumSens for ParallelizerInternal
Revert fortran change, see #715
Concerning #715: tentative fix to make canonicalize_path work for cmake 2.6.0
Bumping required cmake to 2.6, closes #715
Merge branch 'develop' of github.com:casadi/casadi into issue_566
Concerning #566: Updated SQPMethod
Concerning #566: Moved IPMethod class to experimental
Concerning #566: Moved LiftedSQP class to experimental