瀏覽代碼

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

Conflicts:
	support/boot.js
Herbert Vojčík 10 年之前
父節點
當前提交
c7b30e3ea2
共有 1 個文件被更改,包括 1 次插入1 次删除
  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 = {};