Blakko 6e90bc41f6 Merge remote-tracking branch 'origin/master' into internationalization ... Conflicts: extensions/freebase/module/scripts/dialogs/schema-alignment/schema-alignment-dialog.html main/webapp/modules/core/index.vt main/webapp/modules/core/project.vt main/webapp/modules/core/scripts/project/browsing-engine.js main/webapp/modules/core/scripts/project/history-panel.html		2013-07-25 11:07:59 +02:00
..
.settings	Normalize line endings	2013-03-23 18:46:20 -04:00
IDEs	Update to Clojure 1.4. Closes issue #634	2013-02-12 00:15:35 -05:00
src	Merge remote-tracking branch 'origin/master' into internationalization	2013-07-25 11:07:59 +02:00
tests	Really restore Java 6 compatibilty	2013-06-23 14:42:05 -04:00
webapp	Merge remote-tracking branch 'origin/master' into internationalization	2013-07-25 11:07:59 +02:00
.classpath	Update to Clojure 1.4. Closes issue #634	2013-02-12 00:15:35 -05:00
.gitignore	another gitignore for eclipse git support	2010-05-31 09:00:37 +00:00
.project	Convert mixed Java/Javascript projects to faceted form so we can support both languages in Eclipse	2010-10-15 21:42:49 +00:00