merge with 0.6

1 files changed, 6 insertions, 0 deletions

diff --git a/EXAMPLES b/EXAMPLES
index ba65cd1b..b6a03dea 100644
--- a/EXAMPLES
+++ b/EXAMPLES
@@ -34,14 +34,17 @@ included, please mail to `the Google group
 * mpmath: http://mpmath.googlecode.com/svn/trunk/doc/build/index.html
 * MyHDL: http://www.myhdl.org/doc/0.6/
 * NetworkX: http://networkx.lanl.gov/
+* NOC: http://trac.nocproject.org/trac/wiki/NocGuide
 * NumPy: http://docs.scipy.org/doc/numpy/reference/
 * ObjectListView: http://objectlistview.sourceforge.net/python
+* Open ERP: http://doc.openerp.com/
 * OpenEXR: http://excamera.com/articles/26/doc/index.html
 * OpenLayers: http://docs.openlayers.org/
 * openWNS: http://docs.openwns.org/
 * Paste: http://pythonpaste.org/script/
 * Paver: http://www.blueskyonmars.com/projects/paver/
 * Py on Windows: http://timgolden.me.uk/python-on-windows/
+* Pyccuracy: http://www.pyccuracy.org/
 * PyCuda: http://documen.tician.de/pycuda/
 * PyEphem: http://rhodesmill.org/pyephem/
 * Pyevolve: http://pyevolve.sourceforge.net/
@@ -61,6 +64,7 @@ included, please mail to `the Google group
 * Sage: http://sagemath.org/doc/
 * Satchmo: http://www.satchmoproject.com/docs/svn/
 * Scapy: http://www.secdev.org/projects/scapy/doc/
+* SciPy: http://docs.scipy.org/doc/scipy/reference/
 * Selenium: http://seleniumhq.org/docs/
 * Self: http://selflanguage.org/
 * SimPy: http://simpy.sourceforge.net/
@@ -68,12 +72,14 @@ included, please mail to `the Google group
 * Sprox: http://sprox.org/
 * SQLAlchemy: http://www.sqlalchemy.org/docs/
 * Sqlkit: http://sqlkit.argolinux.org/
+* sqlparse: http://python-sqlparse.googlecode.com/svn/docs/api/index.html
 * SymPy: http://docs.sympy.org/
 * tinyTiM: http://tinytim.sourceforge.net/docs/2.0/
 * The Wine Cellar Book: http://www.thewinecellarbook.com/doc/en/
 * TurboGears: http://turbogears.org/2.0/docs/
 * VOR: http://www.vor-cycling.be/
 * WebFaction: http://docs.webfaction.com/
+* Werkzeug: http://werkzeug.pocoo.org/documentation/dev/
 * WFront: http://discorporate.us/projects/WFront/
 * WTForms: http://wtforms.simplecodes.com/docs/
 * Zope 3: e.g. http://docs.carduner.net/z3c-tutorial/