Tom Morris 00dd7f2bdd Merge branch 'master' into fusiontables-migration ... Conflicts: .classpath extensions/gdata/module/MOD-INF/controller.js extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java		2013-07-25 16:13:04 -04:00
..
freebase	Merge remote-tracking branch 'blakko/internationalization' - close #755	2013-07-25 10:53:25 -04:00
gdata	Merge branch 'master' into fusiontables-migration	2013-07-25 16:13:04 -04:00
jython	Specify target Java version for bundled extensions - addresses part	2013-07-10 15:45:25 -04:00
pc-axis	Specify target Java version for bundled extensions - addresses part	2013-07-10 15:45:25 -04:00
sample	Specify target Java version for bundled extensions - addresses part	2013-07-10 15:45:25 -04:00
build.xml	Issue 630: Change branding from Google Refine to OpenRefine	2012-10-18 19:40:31 -04:00