David A. Mellis 12d4552c66 Merge branch 'master' into new-extension ...

Conflicts:
	app/src/processing/app/Editor.java

2010-12-25 18:59:59 -06:00

..

.settings

Importing Processing rev. 5503 (1.0.3).

2009-05-31 15:53:33 +00:00

lib

Reapplying Christian's regex patch.

2010-10-03 19:44:28 -04:00

src/processing/app

Merge branch 'master' into new-extension

2010-12-25 18:59:59 -06:00

.classpath

Importing Processing rev. 5503 (1.0.3).

2009-05-31 15:53:33 +00:00

.classpath_macosx

Importing Processing rev. 5503 (1.0.3).

2009-05-31 15:53:33 +00:00

.classpath_vista

Importing Processing rev. 5503 (1.0.3).

2009-05-31 15:53:33 +00:00

.project

Importing Processing rev. 5503 (1.0.3).

2009-05-31 15:53:33 +00:00

build.xml

Enabling debugging for compilation of the app.

2010-11-27 11:54:07 -06:00