首页 发现 帮助
注册 登录
stevenremot
/
amber
派生自 amber/amber
1
0
派生 0
文件
浏览代码

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

Conflicts:
	index.html
Herbert Vojčík 12 年之前
父节点
d61da29339 e492483051
当前提交
b43b5d55ba
共有 4 个文件被更改，包括 3 次插入 和 3 次删除
合并视图 显示文件统计
  1. 1 1
      cli/index.html
  2. 1 1
      helios.html
  3. 1 1
      index.html
  4. 0 0
      support/amber.js

+ 1 - 1
cli/index.html
查看文件 

@@ -5,7 +5,7 @@
 
     <title>Amber Smalltalk</title> 
     <title>Amber Smalltalk</title> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 
     <meta name="author" content="Nicolas Petton" /> 
     <meta name="author" content="Nicolas Petton" /> 
-    <script type='text/javascript' src='../support/amber4browser.js'></script>
 
+    <script type='text/javascript' src='../support/amber.js'></script>
 
   </head> 
   </head> 
 
 
   <body> 
   <body>

+ 1 - 1
helios.html
查看文件 

@@ -16,7 +16,7 @@
 
       <script type='text/javascript' src='support/jQuery/jquery-ui-1.8.24.custom.min.js'></script>
 
       <script type='text/javascript' src='support/jQuery/jquery-ui-1.8.24.custom.min.js'></script>
 
       <script type='text/javascript' src='support/bootstrap/js/bootstrap.js'></script>
 
       <script type='text/javascript' src='support/bootstrap/js/bootstrap.js'></script>
 
       <script type='text/javascript' src='support/showdown/showdown.js'></script>
 
       <script type='text/javascript' src='support/showdown/showdown.js'></script>
 
-      <script type='text/javascript' src='support/amber4browser.js'></script>
 
+      <script type='text/javascript' src='support/amber.js'></script>
 
       <script type='text/javascript'>
 
       <script type='text/javascript'>
 
         loadAmber({packages: [
 
         loadAmber({packages: [
 
           'Spaces', 'Helios-Core', 'Helios-Exceptions', 'Helios-Commands-Core',
 
           'Spaces', 'Helios-Core', 'Helios-Exceptions', 'Helios-Commands-Core',

+ 1 - 1
index.html
查看文件 

@@ -5,7 +5,7 @@
 
     <title>Amber Smalltalk</title>
 
     <title>Amber Smalltalk</title>
 
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
 
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
 
     <meta name="author" content="Nicolas Petton"/>
 
     <meta name="author" content="Nicolas Petton"/>
 
-    <script type='text/javascript' src='support/amber4browser.js'></script>
 
+    <script type='text/javascript' src='support/amber.js'></script>
 
     <script type='text/javascript' src='support/requirejs/require.min.js'></script>
 
     <script type='text/javascript' src='support/requirejs/require.min.js'></script>
 
 </head>
 
 </head>

+ 0 - 0
support/amber4browser.js → support/amber.js
查看文件