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
..
lib	Update to rev 17 of Fusion Tables JARs	2013-02-11 12:36:45 -05:00
lib-src	Update to rev 17 of Fusion Tables JARs	2013-02-11 12:36:45 -05:00
controller.js	Merge branch 'master' into fusiontables-migration	2013-07-25 16:13:04 -04:00
module.properties	Issue 630: Change branding from Google Refine to OpenRefine	2012-10-18 19:40:31 -04:00