Browse Source

Merge branch 'stable'

# Conflicts:
#	CHANGELOG
Herbert Vojčík 7 years ago
parent
commit
b7e61223d8
6 changed files with 230 additions and 490 deletions
  1. 1 1
      CHANGELOG
  2. 1 1
      bower.json
  3. 224 484
      external/amber-cli/support/amber-cli.js
  4. 1 1
      package.json
  5. 2 2
      src/Kernel-Infrastructure.js
  6. 1 1
      src/Kernel-Infrastructure.st

+ 1 - 1
CHANGELOG

@@ -8,7 +8,7 @@
 Commits: https://lolg.it/amber/amber/commits/0.17.1.
 
 
-?? October 2016 - Release 0.17.0
+19 October 2016 - Release 0.17.0
 ===================================
 
 * Remove some deprecated classes and methods.

+ 1 - 1
bower.json

@@ -1,6 +1,6 @@
 {
   "name": "amber",
-  "version": "0.17.0-pre",
+  "version": "0.18.0-pre",
   "main": "support/amber.js",
   "ignore": [
     "**/.*",

File diff suppressed because it is too large
+ 224 - 484
external/amber-cli/support/amber-cli.js


+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "amber",
-  "version": "0.17.0-pre",
+  "version": "0.18.0-pre",
   "description": "An implementation of the Smalltalk language that runs on top of the JS runtime.",
   "homepage": "http://amber-lang.net",
   "keywords": [

+ 2 - 2
src/Kernel-Infrastructure.js

@@ -3384,12 +3384,12 @@ selector: "version",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-return "0.17.0-pre";
+return "0.18.0-pre";
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "version\x0a\x09\x22Answer the version string of Amber\x22\x0a\x09\x0a\x09^ '0.17.0-pre'",
+source: "version\x0a\x09\x22Answer the version string of Amber\x22\x0a\x09\x0a\x09^ '0.18.0-pre'",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []

+ 1 - 1
src/Kernel-Infrastructure.st

@@ -775,7 +775,7 @@ settings
 version
 	"Answer the version string of Amber"
 	
-	^ '0.17.0-pre'
+	^ '0.18.0-pre'
 ! !
 
 !SmalltalkImage methodsFor: 'accessing amd'!

Some files were not shown because too many files changed in this diff