diff options
| author | Brijeshcr | 2017-07-08 20:18:17 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:17 +0530 |
| commit | bd03b38be0918837e147e969c6bb2014900009db (patch) | |
| tree | 2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /src/c/CACSD/includes | |
| parent | 97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff) | |
| download | Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.gz Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2 Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.zip | |
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'src/c/CACSD/includes')
| -rw-r--r-- | src/c/CACSD/includes/lqr.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/c/CACSD/includes/lqr.h b/src/c/CACSD/includes/lqr.h index aab06d3..5b20ee8 100644 --- a/src/c/CACSD/includes/lqr.h +++ b/src/c/CACSD/includes/lqr.h @@ -17,11 +17,7 @@ extern "C" { #endif -<<<<<<< HEAD void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, double* S, double* X, double* K); -======= -void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ |