[Yuima-commits] r482 - pkg/yuima

[noreply at r-forge.r-project.org]

Author: iacus
Date: 2016-10-15 17:14:36 +0200 (Sat, 15 Oct 2016)
New Revision: 482

Modified:
   pkg/yuima/DESCRIPTION
Log:
updated onezoo

Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2016-10-15 15:13:12 UTC (rev 481)
+++ pkg/yuima/DESCRIPTION	2016-10-15 15:14:36 UTC (rev 482)
@@ -1,16 +1,14 @@
-Package: yuima
-Type: Package
-Title: The YUIMA Project Package for SDEs
-<<<<<<< .mine
-Version: 1.1.11
-=======
-Version: 1.2.0
->>>>>>> .r480
-Depends: R(>= 2.10.0), methods, zoo, stats4, utils, expm, cubature, mvtnorm
-Imports: Rcpp (>= 0.12.1)
-Author: YUIMA Project Team
-Maintainer: Stefano M. Iacus <stefano.iacus at unimi.it>
-Description: Simulation and Inference for Stochastic Differential Equations.
-License: GPL-2
-URL: http://R-Forge.R-project.org/projects/yuima/
-LinkingTo: Rcpp
+Package: yuima
+Type: Package
+Title: The YUIMA Project Package for SDEs
+Version: 1.2.1
+Depends: R(>= 2.10.0), methods, zoo, stats4, utils, expm, cubature, mvtnorm
+Imports: Rcpp (>= 0.12.1)
+Author: YUIMA Project Team
+Maintainer: Stefano M. Iacus <stefano.iacus at unimi.it>
+Description: Simulation and Inference for Stochastic Differential Equations.
+License: GPL-2
+URL: http://R-Forge.R-project.org/projects/yuima/
+LinkingTo: Rcpp
+
+