Skip to content

Commit 6d44093

Browse files
committed
add .editorconfig, roll minor version
1 parent 117f60c commit 6d44093

File tree

4 files changed

+31
-4
lines changed

4 files changed

+31
-4
lines changed

.Rbuildignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ src/lapack
66
^\.Rproj\.user$
77
^.*\.tar\.gz$
88
^local
9-
^vignettes/rmd
9+
^vignettes/rmd
10+
^.editorconfig

.editorconfig

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
12+
# Matches multiple files with brace expansion notation
13+
# 4 space indentation
14+
[*.{c,cpp,h,hpp,R,r}]
15+
indent_style = space
16+
indent_size = 4
17+
18+
# Tab indentation (no size specified)
19+
[Makefile]
20+
indent_style = tab
21+

ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
2020-10-26 Dirk Eddelbuettel <[email protected]>
22

3+
* DESCRIPTION (Version, Date): Roll minor version
4+
35
* src/RcppArmadillo.cpp: Rewrite version number accessors to be more
46
rebust of upstream and compiler settings
57

8+
* .editorconfig: Added for standardized editor behaviour
9+
* .Rbuildignore: Exclude .editorconfig
10+
611
2020-10-24 Condrad Sanderson <[email protected]>
712

813
* inst/include/RcppArmadilloForward.h: Switch to quoted #include

DESCRIPTION

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: RcppArmadillo
22
Type: Package
33
Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
4-
Version: 0.10.1.0.1
5-
Date: 2020-10-21
4+
Version: 0.10.1.0.2
5+
Date: 2020-10-26
66
Author: Dirk Eddelbuettel, Romain Francois, Doug Bates and Binxiang Ni
77
Maintainer: Dirk Eddelbuettel <[email protected]>
88
Description: 'Armadillo' is a templated C++ linear algebra library (by Conrad
@@ -18,7 +18,7 @@ Description: 'Armadillo' is a templated C++ linear algebra library (by Conrad
1818
'RcppArmadillo' (the 'Rcpp' bindings/bridge to Armadillo) is licensed under
1919
the GNU GPL version 2 or later, as is the rest of 'Rcpp'. Note that
2020
Armadillo requires a fairly recent compiler; for the g++ family at least
21-
version 4.6.* is required.
21+
version 4.6.* is required.
2222
License: GPL (>= 2)
2323
LazyLoad: yes
2424
Depends: R (>= 3.3.0)

0 commit comments

Comments
 (0)