merging updates

.Rbuildignore

@@ -1 +1,5 @@
 visual_test
+^.*\.Rproj$
+^\.Rproj\.user$
+^\.travis\.yml$
+^/\.gitattributes$

.gitattributes

@@ -0,0 +1 @@
+/NEWS merge=union

.gitignore

@@ -0,0 +1,3 @@
+.Rproj.user
+.Rhistory
+.RData

.travis.yml

@@ -0,0 +1,39 @@
+# Sample .travis.yml for R projects from https://github.com/craigcitro/r-travis
+
+language: c
+
+before_install:
+  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
+  - chmod 755 ./travis-tool.sh
+  - ./travis-tool.sh bootstrap
+
+install:
+  - ./travis-tool.sh r_binary_install colorspace strucchange deldir abind tensor polyclip minqa Rcpp RcppEigen modeltools bdsmatrix RColorBrewer dichromat munsell labeling tripack akima rgl logspline nor1mix Formula zoo dynlm chron acepack rms mice sp rgeos spatstat PBSmapping mvtnorm TH.data sandwich lme4 robustbase mboost coin car xtable lmtest coxme
+  - ./travis-tool.sh install_deps
+
+script: ./travis-tool.sh run_tests
+
+on_failure:
+  - ./travis-tool.sh dump_logs
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change
+
+
+before_deploy:
+  - ./travis-tool.sh install_github hadley/staticdocs
+  - R -e "staticdocs::build_site()"
+
+deploy:
+  edge: true
+
+  provider: s3
+  access_key_id: AKIAJDM6KGIZ6LSGAK4Q
+  secret_access_key:
+    secure: "r3vSpvVNcpvIcjWFyk+GhYG55iuhfmy3mwuQHQS2EqjT3Skd3mOojnZuRIqy60XXElK5/nfa3qt7KH0GCSd4Is28cqPwh+1PtQ0ZVXfeKefAk2whTPDI4P+rgOA+srUxZraLALap9QGmvlzJyXbqBCRdDmXUjtXKi2ONE9PrUk4="
+  bucket: docs.ggplot2.org
+  skip_cleanup: true
+  local-dir: inst/web
+  upload-dir: dev

DESCRIPTION

@@ -35,18 +35,34 @@ Suggests:
     maptools,
     multcomp,
     nlme,
-    testthat
+    testthat,
+    knitr,
+    mgcv
+VignetteBuilder: knitr
 Enhances: sp
+Roxygen: list(wrap = FALSE)
 License: GPL-2
-URL: http://had.co.nz/ggplot2/
+URL: http://ggplot2.org, https://github.com/hadley/ggplot2
+BugReports: https://github.com/hadley/ggplot2/issues
 LazyData: true
 Collate:
     'aaa-.r'
     'aaa-constants.r'
     'aes-colour-fill-alpha.r'
+    'aes-group-order.r'
     'aes-linetype-size-shape.r'
+    'aes-position.r'
     'aes.r'
+    'geom-.r'
+    'annotation-custom.r'
+    'annotation-logticks.r'
+    'geom-polygon.r'
+    'geom-map.r'
+    'annotation-map.r'
+    'geom-raster.r'
+    'annotation-raster.r'
     'annotation.r'
+    'autoplot.r'
     'bench.r'
     'coord-.r'
     'coord-cartesian-.r'
@@ -66,9 +82,9 @@ Collate:
     'facet-wrap.r'
     'fortify-lm.r'
     'fortify-map.r'
+    'fortify-multcomp.r'
     'fortify-spatial.r'
     'fortify.r'
-    'geom-.r'
     'geom-abline.r'
     'geom-bar-.r'
     'geom-bar-histogram.r'
@@ -84,8 +100,6 @@ Collate:
     'geom-hex.r'
     'geom-hline.r'
     'geom-linerange.r'
-    'geom-polygon.r'
-    'geom-map.r'
     'geom-path-.r'
     'geom-path-contour.r'
     'geom-path-density2d.r'
@@ -117,7 +131,6 @@ Collate:
     'labels.r'
     'layer.r'
     'limits.r'
-    'matrix.r'
     'panel.r'
     'plot-build.r'
     'plot-construction.r'
@@ -153,16 +166,15 @@ Collate:
     'scale-size.r'
     'scales-.r'
     'stat-.r'
-    'stat-summary-2d.r'
-    'stat-summary-hex.r'
     'stat-bin.r'
     'stat-bin2d.r'
+    'stat-bindot.r'
     'stat-binhex.r'
     'stat-boxplot.r'
     'stat-contour.r'
     'stat-density-2d.r'
     'stat-density.r'
-    'stat-bindot.r'
+    'stat-ecdf.r'
     'stat-function.r'
     'stat-identity.r'
     'stat-qq.r'
@@ -171,37 +183,29 @@ Collate:
     'stat-smooth.r'
     'stat-spoke.r'
     'stat-sum.r'
+    'stat-summary-2d.r'
+    'stat-summary-hex.r'
     'stat-summary.r'
     'stat-unique.r'
     'stat-vline.r'
     'stat-ydensity.r'
-    'stat-ecdf.r'
     'summary.r'
     'templates.r'
     'theme-defaults.r'
     'theme-elements.r'
     'theme.r'
+    'translate-qplot-base.r'
+    'translate-qplot-ggplot.r'
+    'translate-qplot-gpl.r'
+    'translate-qplot-lattice.r'
     'utilities-break.r'
     'utilities-grid.r'
+    'utilities-help.r'
     'utilities-layer.r'
     'utilities-matrix.r'
     'utilities-resolution.r'
     'utilities-table.r'
     'utilities.r'
     'xxx-digest.r'
     'zxx.r'
-    'geom-raster.r'
-    'annotation-raster.r'
-    'annotation-map.r'
-    'autoplot.r'
     'zzz.r'
-    'fortify-multcomp.r'
-    'annotation-custom.r'
-    'aes-group-order.r'
-    'aes-position.r'
-    'translate-qplot-base.r'
-    'translate-qplot-ggplot.r'
-    'translate-qplot-gpl.r'
-    'translate-qplot-lattice.r'
-    'annotation-logticks.r'
-    'utilities-help.r'

NAMESPACE

@@ -1,3 +1,5 @@
+# Generated by roxygen2 (4.0.0): do not edit by hand
+
 S3method("+",gg)
 S3method("[",uneval)
 S3method(as.character,uneval)
@@ -412,3 +414,4 @@ import(proto)
 import(reshape2)
 import(scales)
 importFrom(MASS,kde2d)
+importFrom(methods,setRefClass)