diff options
| author | Brijeshcr | 2017-07-07 18:19:45 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-07 18:19:45 +0530 |
| commit | 5258fe20f21514eca1f7dc4ee384fe63c35c68a1 (patch) | |
| tree | c0424024c16aa122a5a38686dfed75a4c4866e95 /2.3-1/src/c/CACSD/includes | |
| parent | 8d1da9568248c9a0572da08a7039e75e84d782b0 (diff) | |
| parent | a505550d38b2b886c61863a85be67faf02ad604b (diff) | |
| download | Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.gz Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.bz2 Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.zip | |
Merge pull request #12 from yash1112/master
SCi2cDeps updated, 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" */ |