generators/facebook/facebook_generator.rb generators/facebook_controller/facebook_controller_generator.rb generators/facebook_publisher/facebook_publisher_generator.rb generators/facebook_scaffold/facebook_scaffold_generator.rb @@ -9,44 +9,8 @@ TODO.txt generators/facebooker/facebooker_generator.rb generators/facebooker/templates/config/facebooker.yml generators/facebooker/templates/public/javascripts/facebooker.js -<<<<<<< HEAD:Manifest.txt generators/publisher/publisher_generator.rb generators/publisher/templates/publisher.rb -generators/controller/USAGE -generators/controller/controller_generator.rb -generators/controller/templates/controller.rb -generators/controller/templates/functional_test.rb -generators/controller/templates/helper.rb -generators/controller/templates/view.fbml.erb -generators/controller/templates/view.html.erb -generators/publisher/templates/create_facebook_templates.rb -generators/receiver/receiver_generator.rb -generators/receiver/templates -generators/receiver/templates/xd_receiver.html -generators/scaffold/USAGE -generators/scaffold/scaffold_generator.rb -generators/scaffold/templates -generators/scaffold/templates/.svn -generators/scaffold/templates/.svn/text-base -generators/scaffold/templates/controller.rb -generators/scaffold/templates/facebook_style.css -generators/scaffold/templates/functional_test.rb -generators/scaffold/templates/helper.rb -generators/scaffold/templates/layout.fbml.erb -generators/scaffold/templates/layout.html.erb -generators/scaffold/templates/style.css -generators/scaffold/templates/view_edit.fbml.erb -generators/scaffold/templates/view_edit.html.erb -generators/scaffold/templates/view_index.fbml.erb -generators/scaffold/templates/view_index.html.erb -generators/scaffold/templates/view_new.fbml.erb -generators/scaffold/templates/view_new.html.erb -generators/scaffold/templates/view_show.fbml.erb -generators/scaffold/templates/view_show.html.erb -init.rb -install.rb -javascripts/facebooker.js -======= generators/facebooker_controller/USAGE generators/facebooker_controller/facebooker_conroller_generator.rb generators/facebooker_controller/templates/controller.rb @@ -77,7 +41,6 @@ generators/facebooker_scaffold/templates/view_show.html.erb init.rb install.rb lib/facebooker.rb ->>>>>>> 2eccb19... updated manifest:Manifest.txt lib/facebooker/adapters/adapter_base.rb lib/facebooker/adapters/bebo_adapter.rb lib/facebooker/adapters/facebook_adapter.rb Manifest.txt @@ -2,7 +2,7 @@ require 'fileutils' require 'rubygems' dir = File.dirname(__FILE__) -templates = File.join(dir, 'generators', 'facebooker', 'templates') +templates = File.join(dir, 'generators', 'facebook', 'templates') config = File.join('config', 'facebooker.yml') script = File.join('public', 'javascripts', 'facebooker.js') install.rb generators/facebook/facebooker_generator.rb generators/facebook_controller/facebooker_controller_generator.rb generators/facebook_publisher/facebooker_publisher_generator.rb generators/facebook_scaffold/facebooker_scaffold_generator.rb 2ffdb8a670120a53cfc4d6f41d81a5d4650d8200 Corey Innis corey@coolerator.net http://github.com/digitalhobbit/facebooker/commit/38f73916ede7f88390f72a721af409c231fb2f22 38f73916ede7f88390f72a721af409c231fb2f22 2008-10-31T08:28:44-07:00 2008-10-04T12:37:29-07:00 some spelling corrections and file/generator renaming (part 2) 40f2a3571bc74e11697839b7495594bed01ec9d3 Michael Mangino mmangino@elevatedrails.com