Merlijn Wajer 7c8600311c Merge branch 'master' into cts-rework ...

Conflicts:
	Doc/sphinx/conf.py
	Doc/sphinx/libmml/intro.rst

2011-07-24 00:14:53 +02:00

..

lape @ 1b8211db37

Lape: Update head.

2011-07-05 18:46:52 +02:00

Linux

Simba: Keybinder: bind -> unbind.

2011-04-09 20:45:58 +02:00

Misc

Temporary fix.. It's ugly.

2011-02-17 19:31:54 +01:00

MMLAddon

Simba: Fix double-colour picking crash.

2011-07-22 13:54:19 +02:00

MMLCore

Merge branch 'master' into cts-rework

2011-07-24 00:14:53 +02:00

PascalScript

Simba/PS: Added extra directive ``FIXME''.

2011-02-21 14:36:55 +01:00

RUTIS

Merge ssh://villavu.com:54367/simba

2010-09-17 20:01:22 +02:00

Synapse

Simba: Fix compilation under Linux x64.

2011-06-26 10:52:14 +02:00