patrick 2970feb5ab Merge remote-tracking branch 'upstream/master' ...

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

2014-08-14 13:25:14 -04:00

..

.settings

and that

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

src

Merge remote-tracking branch 'upstream/master'

2014-08-14 13:25:14 -04: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

adding ignore files

2013-01-27 10:52:36 -05:00

.project

changing names

2010-01-24 19:56:51 +00:00

build.xml

extended build script to add and rm property files

2014-07-31 18:09:00 +02:00