Lance Stout 72e1ab47fc Merge branch 'docs' into develop ...

Conflicts:
	docs/_static/haiku.css
	docs/_static/header.png
	docs/conf.py
	docs/getting_started/muc.rst
	docs/index.rst
	examples/muc.py

2012-01-18 15:04:33 -08:00

..

fonts

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

images

More &yet branding

2012-01-05 13:07:44 -05:00

agogo.css

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

basic.css

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

default.css

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

haiku.css

Merge branch 'docs' into develop

2012-01-18 15:04:33 -08:00

header.png

More &yet branding

2012-01-05 13:07:44 -05:00

ir_black.css

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

nature.css

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

noise_dk.png

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00

pygments.css

Update doc settings to new theme, add examples, use 1.0

2012-01-05 12:13:06 -05:00

sphinxdoc.css

Break the docs out into their own branch.

2012-01-05 11:31:54 -05:00