Rebase GHCJS branch onto master

transient-haskell / transient

A full stack, reactive architecture for general purpose programming. Algebraic and monadically composable primitives for concurrency, parallelism, event handling, transactions, multithreading, Web, and distributed computing with complete de-inversion of control (No callbacks, no blocking, pure state)

MIT License

633 stars 28 forks source link

Rebase GHCJS branch onto master #13

Closed geraldus closed 8 years ago

geraldus commented 8 years ago

Let's see what GitHub will say now. I've selected ghcjs branch this time

geraldus commented 8 years ago

Hmm… It says there are some conflicts that must be resolved… I will consult one pal what is the best way to update license and fix haddock again. Don't hurry with merging this