Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:tjweir/liftbook
Browse files Browse the repository at this point in the history 
Conflicts:

	chap-welcome.lyx
  • Loading branch information
@dchenbecker
dchenbecker committed Dec 18, 2008
2 parents e78c062 + eee9d0d commit 3401349
Show file tree
Hide file tree
Showing 2 changed files with 475 additions and 739 deletions.

0 comments on commit 3401349

Please sign in to comment.