Explorar o código

Merge remote-tracking branch 'upstream/master' into requirejs

Conflicts:
	support/boot.js
Herbert Vojčík %!s(int64=11) %!d(string=hai) anos
pai
achega
c7b30e3ea2
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      support/boot.js

+ 1 - 1
support/boot.js

@@ -36,7 +36,7 @@
 
 define("amber_vm/boot", [ './browser-compatibility' ], function () {
 
-/* Array extensions */
+/* Reconfigurable micro composition system, https://github.com/amber-smalltalk/brikz */
 
 function Brikz(api, apiKey, initKey) {
 	var brikz = this, backup = {};