Skip to content

Commit

Permalink
Merge branch 'master' of github.com:perl6/book
Browse files Browse the repository at this point in the history 
Conflicts:
	src/basics.pod
  • Loading branch information
Carl Masak committed Nov 11, 2009
2 parents 30057bc + 21fdcc7 commit a6cee3d
Show file tree
Hide file tree
Showing 2 changed files with 545 additions and 265 deletions.

0 comments on commit a6cee3d

Please sign in to comment.