Merge branch 'tonylocal' into mob
commit4ea0ef07652e80e7ff68048d3eb8a4a8770af4f1
authorAJ Rossini <blindglobe@gmail.com>
Sat, 13 Oct 2007 20:32:23 +0000 (13 22:32 +0200)
committerAJ Rossini <blindglobe@gmail.com>
Sat, 13 Oct 2007 20:32:23 +0000 (13 22:32 +0200)
tree40c268a31599be78f81f95f19bf269313ea8758b
parent419df580a8915e9d21547a956b42d17e25574947
parent1a8e0e06118c6a41d9b6a1393657e6484fdff054
Merge branch 'tonylocal' into mob

* tonylocal:
  Update on strategy.
  stripped down version of LIFT, code and examples, not whole repo.
  removing old lift
  remove softlink
  whitespace
  fixed data, init, and ls-user
  use complete forms to initialize environment
  compiles again
  softlink from lift.darcs to lift
  using darcs repo of lift

Conflicts: