George Bateman bcc9be36e7 Merge branch 'master' of https://github.com/processing/processing into mnem-patch ...

Conflicts:
	pdex/src/processing/mode/experimental/DebugEditor.java

2014-11-18 18:14:00 +00:00

..

.settings

and that

2014-07-31 14:31:47 -04:00

src

Merge branch 'master' of https://github.com/processing/processing into mnem-patch

2014-11-18 18:14:00 +00:00

test

Merge pull request #2772 from JakubValtar/preproc-constructorCast-fix

2014-08-12 09:25:32 -04:00

.classpath

PDE X prefs work

2014-06-26 13:40:37 +05:30

.gitignore

…

.project

…

build.xml

Use 1.7 as source and target Java version

2014-10-20 23:52:26 -03:00