Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package.json
This commit is contained in:
Tom Ball 2016-06-16 16:16:08 -04:00
commit 3efbb4fbde
2 changed files with 8 additions and 4 deletions

View File

@ -6,9 +6,9 @@ Turn off all the LED lights on the [LED screen](/device/screen).
basic.clearScreen() basic.clearScreen()
``` ```
### Example: vanishing heart ### Example: Vanishing heart
The following code shows a heart on the screen and then turns off all the LED lights using `clear screen`: The following code shows a heart on the screen and then turns off all the LED lights.
```blocks ```blocks
basic.showLeds(` basic.showLeds(`
@ -23,5 +23,5 @@ basic.clearScreen()
### See also ### See also
[set brightness](/reference/led/set-brightness), [unplot](/reference/led/unplot), [plot](/reference/led/plot), [Image](/reference/images/image), [clear](/reference/basic/clear-screen) [set brightness](/reference/led/set-brightness), [unplot](/reference/led/unplot), [plot](/reference/led/plot), [Image](/reference/images/image)

View File

@ -1,6 +1,10 @@
{ {
"name": "pxt-microbit", "name": "pxt-microbit",
<<<<<<< HEAD
"version": "0.2.166", "version": "0.2.166",
=======
"version": "0.2.168",
>>>>>>> origin/master
"description": "BBC micro:bit target for PXT", "description": "BBC micro:bit target for PXT",
"keywords": [ "keywords": [
"JavaScript", "JavaScript",
@ -29,6 +33,6 @@
"typescript": "^1.8.7" "typescript": "^1.8.7"
}, },
"dependencies": { "dependencies": {
"pxt-core": "0.2.179" "pxt-core": "0.2.180"
} }
} }