Julian Dolby b34fe4d21f Merge branch 'master' of https://github.com/wala/WALA ... Conflicts: com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF		2015-06-02 23:00:32 -04:00
..
org.eclipse.jdt.core.prefs	Merge branch 'master' of https://github.com/wala/WALA	2015-06-02 23:00:32 -04:00
org.eclipse.jdt.ui.prefs	more conversion to Unix line endings	2012-09-04 15:59:50 -07:00