Permalink
Browse files

Merge branch 'develop' into feature/new-guides-with-gtable

Conflicts:
	NAMESPACE
  • Loading branch information...
2 parents c387514 + e9a372d commit d3c088421fdf909941fa9a789e60d97a8b766aa8 @kohske kohske committed Jul 12, 2011
Showing with 2,838 additions and 1,818 deletions.
  1. +2 −1 DESCRIPTION
  2. +239 −180 NAMESPACE
  3. +3 −4 R/aes-colour-fill-alpha.r
  4. +2 −3 R/aes-linetype-size-shape.r
  5. +18 −30 R/coord-cartesian-.r
  6. +1 −1 R/ggplot2.r
  7. +1 −1 R/guides-axis.r
  8. +6 −5 R/plot-render.r
  9. +0 −5 R/scale-.r
  10. +5 −6 R/scale-brewer.r
  11. +18 −9 R/scale-continuous.r
  12. +4 −3 R/scale-date.r
  13. +4 −3 R/scale-datetime.r
  14. +4 −1 R/scale-discrete-.r
  15. +4 −10 R/scale-gradient.r
  16. +4 −0 R/scale-gradient2.r
  17. +4 −0 R/scale-gradientn.r
  18. +5 −1 R/scale-grey.r
  19. +4 −1 R/scale-hue.r
  20. +16 −2 R/scale-identity.r
  21. +9 −2 R/scale-linetype.r
  22. +17 −3 R/scale-manual.r
  23. +9 −1 R/scale-shape.r
  24. +7 −4 R/scale-size.r
  25. +5 −3 man/absoluteGrob.Rd
  26. +16 −9 man/aes.Rd
  27. +10 −6 man/aes_all.Rd
  28. +16 −23 man/aes_colour_fill_alpha.Rd
  29. +17 −24 man/aes_linetype_size_shape.Rd
  30. +13 −8 man/aes_string.Rd
  31. +17 −5 man/annotate.Rd
  32. +11 −7 man/benchplot.Rd
  33. +7 −6 man/coord.Rd
  34. +19 −13 man/coord_cartesian.Rd
  35. +10 −7 man/coord_fixed.Rd
  36. +8 −5 man/coord_flip.Rd
  37. +26 −15 man/coord_map.Rd
  38. +26 −17 man/coord_polar.Rd
  39. +17 −12 man/coord_trans.Rd
  40. +18 −8 man/cut_interval.Rd
  41. +16 −7 man/cut_number.Rd
  42. +7 −6 man/cweave.Rd
  43. +5 −4 man/diamonds.Rd
  44. +5 −4 man/economics.Rd
  45. +14 −11 man/expand_limits.Rd
  46. +9 −6 man/facet.Rd
  47. +26 −19 man/facet_grid.Rd
  48. +8 −4 man/facet_null.Rd
  49. +22 −15 man/facet_wrap.Rd
  50. +14 −8 man/fortify.Rd
  51. +33 −26 man/fortify.lm.Rd
  52. +18 −11 man/fortify.map.Rd
  53. +10 −7 man/fortify.sp.Rd
  54. +17 −12 man/geom_abline.Rd
  55. +8 −5 man/geom_area.Rd
  56. +26 −19 man/geom_bar.Rd
  57. +9 −5 man/geom_bin2d.Rd
  58. +9 −6 man/geom_blank.Rd
  59. +23 −15 man/geom_boxplot.Rd
  60. +12 −6 man/geom_contour.Rd
  61. +19 −10 man/geom_crossbar.Rd
  62. +11 −6 man/geom_density.Rd
  63. +14 −8 man/geom_density2d.Rd
  64. +22 −14 man/geom_errorbar.Rd
  65. +17 −11 man/geom_errorbarh.Rd
  66. +14 −8 man/geom_freqpoly.Rd
  67. +8 −4 man/geom_hex.Rd
  68. +13 −10 man/geom_histogram.Rd
  69. +16 −10 man/geom_hline.Rd
  70. +16 −11 man/geom_jitter.Rd
  71. +17 −11 man/geom_line.Rd
  72. +20 −12 man/geom_linerange.Rd
  73. +27 −16 man/geom_path.Rd
  74. +25 −20 man/geom_point.Rd
  75. +16 −9 man/geom_pointrange.Rd
  76. +19 −12 man/geom_polygon.Rd
  77. +9 −6 man/geom_quantile.Rd
  78. +9 −5 man/geom_rect.Rd
  79. +15 −9 man/geom_ribbon.Rd
  80. +9 −5 man/geom_rug.Rd
  81. +19 −12 man/geom_segment.Rd
  82. +10 −6 man/geom_smooth.Rd
  83. +13 −9 man/geom_step.Rd
  84. +14 −10 man/geom_text.Rd
  85. +10 −7 man/geom_tile.Rd
  86. +18 −12 man/geom_vline.Rd
  87. +22 −13 man/ggfluctuation.Rd
  88. +23 −14 man/ggmissing.Rd
  89. +9 −6 man/ggorder.Rd
  90. +18 −10 man/ggpcp.Rd
  91. +10 −8 man/ggplot-add.Rd
  92. +11 −6 man/ggplot.Rd
  93. +18 −9 man/ggplot.data.frame.Rd
  94. +4 −4 man/ggplot2.Rd
  95. +12 −9 man/ggplot_build.Rd
  96. +17 −10 man/ggplot_gtable.Rd
  97. +32 −19 man/ggsave.Rd
  98. +1 −2 man/ggscale.Rd
  99. +11 −6 man/ggstructure.Rd
  100. +28 −18 man/gtable.Rd
  101. +7 −5 man/interleave.Rd
  102. +4 −2 man/is.coord.Rd
  103. +7 −5 man/is.facet.Rd
  104. +11 −6 man/label_both.Rd
  105. +14 −9 man/label_bquote.Rd
  106. +15 −8 man/label_parsed.Rd
  107. +12 −7 man/label_value.Rd
  108. +15 −10 man/labs.Rd
  109. +4 −2 man/last_plot.Rd
  110. +12 −7 man/limits.Rd
  111. +22 −14 man/map_data.Rd
  112. +10 −5 man/mean_se.Rd
  113. +7 −6 man/midwest.Rd
  114. +8 −5 man/movies.Rd
  115. +6 −5 man/mpg.Rd
  116. +8 −7 man/msleep.Rd
  117. +0 −19 man/muted.Rd
  118. +54 −18 man/opts.Rd
  119. +15 −8 man/plotmatrix.Rd
  120. +9 −5 man/position_dodge.Rd
  121. +8 −4 man/position_fill.Rd
  122. +4 −2 man/position_identity.Rd
  123. +16 −11 man/position_jitter.Rd
  124. +8 −4 man/position_stack.Rd
  125. +5 −4 man/presidential.Rd
  126. +13 −6 man/print.ggplot.Rd
  127. +59 −32 man/qplot.Rd
  128. +7 −6 man/rweave.Rd
  129. +17 −10 man/scale_alpha_continuous.Rd
  130. +9 −6 man/scale_alpha_discrete.Rd
  131. +11 −6 man/scale_area.Rd
  132. +13 −7 man/{scale_colour_brewer.Rd → scale_brewer.Rd}
  133. +0 −50 man/scale_colour_gradient2.Rd
  134. +0 −35 man/scale_colour_gradientn.Rd
  135. +0 −26 man/scale_colour_identity.Rd
  136. +37 −16 man/scale_continuous.Rd
  137. +18 −11 man/{scale_x_date.Rd → scale_date.Rd}
  138. +11 −4 man/{scale_x_datetime.Rd → scale_datetime.Rd}
  139. +11 −5 man/{scale_x_discrete.Rd → scale_discrete.Rd}
  140. +24 −11 man/{scale_colour_gradient.Rd → scale_gradient.Rd}
  141. +95 −0 man/scale_gradient2.Rd
  142. +16 −8 man/{scale_colour_grey.Rd → scale_grey.Rd}
  143. +15 −7 man/{scale_colour_hue.Rd → scale_hue.Rd}
  144. +48 −0 man/scale_identity.Rd
  145. +16 −6 man/scale_linetype.Rd
  146. +22 −3 man/{scale_colour_manual.Rd → scale_manual.Rd}
  147. +17 −4 man/scale_shape.Rd
  148. +20 −9 man/{scale_size_continuous.Rd → scale_size.Rd}
  149. +0 −8 man/scale_size_discrete.Rd
  150. +4 −2 man/scale_train.Rd
  151. +8 −5 man/seals.Rd
  152. +11 −7 man/should_stop.Rd
  153. +8 −4 man/stat_abline.Rd
  154. +33 −19 man/stat_bin.Rd
  155. +13 −7 man/stat_bin2d.Rd
  156. +12 −6 man/stat_binhex.Rd
  157. +17 −11 man/stat_boxplot.Rd
  158. +14 −8 man/stat_contour.Rd
  159. +30 −22 man/stat_density.Rd
  160. +22 −15 man/stat_density2d.Rd
  161. +20 −11 man/stat_function.Rd
  162. +8 −4 man/stat_hline.Rd
  163. +8 −4 man/stat_identity.Rd
  164. +24 −12 man/stat_qq.Rd
  165. +25 −13 man/stat_quantile.Rd
  166. +58 −42 man/stat_smooth.Rd
  167. +14 −8 man/stat_spoke.Rd
  168. +17 −9 man/stat_sum.Rd
  169. +31 −24 man/stat_summary.Rd
  170. +9 −5 man/stat_unique.Rd
  171. +8 −4 man/stat_vline.Rd
  172. +7 −3 man/summary.ggplot.Rd
  173. +1 −1 man/theme_blank.Rd
  174. +8 −5 man/theme_bw.Rd
  175. +10 −7 man/theme_grey.Rd
  176. +14 −9 man/theme_line.Rd
  177. +16 −9 man/theme_rect.Rd
  178. +14 −9 man/theme_segment.Rd
  179. +19 −7 man/theme_text.Rd
  180. +13 −10 man/theme_update.Rd
  181. +11 −6 man/update_labels.Rd
  182. +15 −10 man/wrap_hmisc.Rd
  183. +13 −9 man/xlim.Rd
  184. +13 −9 man/ylim.Rd
  185. +1 −1 man/zeroGrob.Rd
View
@@ -20,7 +20,8 @@ Imports:
digest,
grid,
reshape2,
- scales
+ scales,
+ memoise
Suggests:
quantreg,
Hmisc,
Oops, something went wrong.

0 comments on commit d3c0884

Please sign in to comment.