Merge remote-tracking branch 'upstream/master' into json-ru

This commit is contained in:
TheDmitry 2015-01-31 21:33:57 +03:00
commit 955e5faf4a
2 changed files with 2 additions and 1 deletions

View File

@ -85,7 +85,7 @@ int main() {
// doubles are usually 64-bit floating-point numbers
double x_double = 0.0; // real numbers without any suffix are doubles
// integer types may be unsigned (only positive)
// integer types may be unsigned (greater than or equal to zero)
unsigned short ux_short;
unsigned int ux_int;
unsigned long long ux_long_long;

View File

@ -259,6 +259,7 @@ levels(infert$education) # "0-5yrs" "6-11yrs" "12+ yrs"
# NULL
# "NULL" is a weird one; use it to "blank out" a vector
class(NULL) # NULL
parakeet = c("beak", "feathers", "wings", "eyes")
parakeet
# =>
# [1] "beak" "feathers" "wings" "eyes"