Merge remote-tracking branch 'upstream/master'

This commit is contained in:
El Potaeto
2015-01-28 10:13:58 +01:00
35 changed files with 117 additions and 68 deletions

View File

@@ -1,4 +1,4 @@
# Generated by roxygen2 (4.1.0): do not edit by hand
# Generated by roxygen2 (4.0.1): do not edit by hand
export(getinfo)
export(setinfo)