diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-03-24 14:06:49 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-03-24 14:06:49 -0700 |
| commit | 398f6f7631c30d3591bd0c5d9e3c0da73a95d6e1 (patch) | |
| tree | 969292be8b11b522a25ad2441455df4e802a3a44 | |
| parent | 1762d5adba1916625c9158592d16085bd6a3b8e3 (diff) | |
| parent | e3ec6a604b651b0791987b7563060041f76a17b6 (diff) | |
Merge branch 'patch-1' of github.com:dandv/emscripten into incoming
Conflicts:
README.markdown
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@  -Emscripten is an LLVM-to-JavaScript compiler. It takes LLVM bitcode - which can be generated +Emscripten is an [LLVM](https://en.wikipedia.org/wiki/LLVM)-to-JavaScript compiler. It takes LLVM bitcode - which can be generated from C/C++, using `llvm-gcc` (DragonEgg) or `clang`, or any other language that can be converted into LLVM - and compiles that into JavaScript, which can be run on the web (or anywhere else JavaScript can run). |