diff options
| author | yash1112 | 2017-07-07 22:34:47 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:34:47 +0530 |
| commit | 2a6c003c67faafd257984f4ae632e40bc6fa9a32 (patch) | |
| tree | 5eecfb962980f7c32cd167bd7e124166e4741343 /2.3-1/src/c/CACSD/includes | |
| parent | ce61940a1398e66d9d09b81241789576c1ceca01 (diff) | |
| parent | 640f9fcf3f64298c7958f4bde5a7e6a7602a690d (diff) | |
| download | Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.tar.gz Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.tar.bz2 Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.zip | |
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to '2.3-1/src/c/CACSD/includes')
| -rw-r--r-- | 2.3-1/src/c/CACSD/includes/lqr.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/2.3-1/src/c/CACSD/includes/lqr.h b/2.3-1/src/c/CACSD/includes/lqr.h index 5b20ee83..aab06d33 100644 --- a/2.3-1/src/c/CACSD/includes/lqr.h +++ b/2.3-1/src/c/CACSD/includes/lqr.h @@ -17,7 +17,11 @@ 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" */ |