Merged rstudio/master into branch.

This commit is contained in:
trestletech
2013-12-03 15:15:14 -06:00
39 changed files with 8687 additions and 6746 deletions

View File

@@ -35,6 +35,7 @@ export(checkboxGroupInput)
export(checkboxInput)
export(code)
export(conditionalPanel)
export(dataTableOutput)
export(dateInput)
export(dateRangeInput)
export(div)
@@ -88,6 +89,7 @@ export(reactiveTimer)
export(reactiveUI)
export(reactiveValues)
export(reactiveValuesToList)
export(renderDataTable)
export(renderImage)
export(renderPlot)
export(renderPrint)