Tom Morris eeb082b763 Merge remote-tracking branch 'origin/master' into fusiontables-migration ... Conflicts: extensions/freebase/module/langs/translation-default.json extensions/freebase/module/langs/translation-en.json extensions/freebase/module/langs/translation-it.json extensions/freebase/src/com/google/refine/freebase/commands/LoadLanguageCommand.java extensions/gdata/module/MOD-INF/controller.js extensions/gdata/module/langs/translation-default.json extensions/gdata/module/langs/translation-en.json extensions/gdata/module/langs/translation-it.json extensions/gdata/src/com/google/refine/extension/gdata/commands/LoadLanguageCommand.java main/src/com/google/refine/commands/lang/LoadLanguageCommand.java main/src/com/google/refine/commands/lang/SetLanguageCommand.java main/webapp/modules/core/langs/translation-default.json main/webapp/modules/core/langs/translation-en.json main/webapp/modules/core/langs/translation-it.json main/webapp/modules/core/scripts/index/lang-settings-ui.js		2013-08-16 17:56:56 -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 remote-tracking branch 'origin/master' into fusiontables-migration	2013-08-16 17:56:56 -04:00
module.properties	Issue 630: Change branding from Google Refine to OpenRefine	2012-10-18 19:40:31 -04:00