Permalink
Browse files

Merge branch 'master' of github.com:clemos/try-haxe

Conflicts:
	.gitmodules
  • Loading branch information...
2 parents 918ac8a + 4b10c2e commit 37f26ff80a5239b5e14785745c73c663af61ae00 @clemos committed Oct 7, 2012
Showing with 8 additions and 4 deletions.
  1. +4 −1 .gitmodules
  2. +2 −2 build.hxml
  3. +1 −1 index.html
  4. +1 −0 lib/haxe-bootstrap
  5. BIN lib/swf/away3d4.swf
View
@@ -1,3 +1,6 @@
[submodule "CodeMirror2"]
path = lib/CodeMirror2
- url = git://github.com/marijnh/CodeMirror.git
+ url = git://github.com/marijnh/CodeMirror2.git
+[submodule "haxe-bootstrap"]
+ path = lib/haxe-bootstrap
+ url = git://github.com/clemos/haxe-bootstrap.git
View
@@ -3,9 +3,9 @@
-main App
--next
--cp ../bootstrap
+-cp lib/haxe-bootstrap
-D noEmbedBootstrap
-D noEmbedJS
-cp src
-js app.js
--main App
+-main App
View
@@ -154,7 +154,7 @@
</div>
<div class="row-fluid">
<div class="span12">
- <div class="pull-right"><span class="help-inline">r4957</span></div>
+ <div class="pull-right"><span class="help-inline">r5270</span></div>
</div>
</div>
Submodule haxe-bootstrap added at c7c5bf
View
Binary file not shown.

0 comments on commit 37f26ff

Please sign in to comment.