Andrew Macgregor 1336375ab4 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	docs/conf.py

2012-10-20 09:17:18 +08:00

..

_static

import from osxpython.org

2011-03-20 20:35:44 -04:00

_templates

gittip

2012-07-28 17:11:13 -04:00

_themes

don't change scrollbars

2012-06-07 22:44:14 -04:00

dev

Added NINJA-IDE to IDEs

2012-09-28 21:08:42 +02:00

intro

fix minor white space issue causing warning

2012-10-16 20:44:34 +08:00

notes

Fix spelling in styleguide.rst

2012-07-03 21:43:08 -06:00

scenarios

using anonymous hyperlinks to avoid duplicate explicit name warnings

2012-10-16 22:10:25 +08:00

shipping

Add comparison table and py2exe notes on freezing topic

2012-07-25 22:47:26 +02:00

starting

adding a valid label for installation.rst to ref to

2012-10-15 14:42:57 +08:00

writing

provide valid link for YAGNI

2012-10-16 23:19:54 +08:00

conf.py

death to curly quotes!

2012-10-17 09:21:40 -07:00

contents.rst.inc

Added Scenario "XML parsing" and untangle lib.

2012-05-03 19:54:20 +02:00

index.rst

Merge remote-tracking branch 'origin/master'

2012-04-26 02:53:25 -04:00

make.bat

import from osxpython.org

2011-03-20 20:35:44 -04:00

Makefile

import from osxpython.org

2011-03-20 20:35:44 -04:00