Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/rsanheim/echoe into rsanhei…
Browse files Browse the repository at this point in the history
…m/master

Conflicts:

	lib/echoe.rb
  • Loading branch information
ELLIOTTCABLE committed Oct 14, 2008
2 parents b982b06 + 2f936f1 commit f6e0e74
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -9,6 +9,6 @@ Echoe.new('echoe') do |p|
p.docs_host = 'blog.evanweaver.com:~/www/bax/public/files/doc/'
p.runtime_dependencies = ['rake', 'rubyforge >=1.0.0', 'highline']
p.development_dependencies = []
p.require_signed = true
p.require_signed = false
end

2 changes: 1 addition & 1 deletion echoe.gemspec
Expand Up @@ -4,7 +4,7 @@ Gem::Specification.new do |s|

s.required_rubygems_version = Gem::Requirement.new("= 1.2") if s.respond_to? :required_rubygems_version=
s.authors = ["Evan Weaver"]
s.date = %q{2008-07-02}
s.date = %q{2008-07-04}
s.description = %q{A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.}
s.email = %q{}
s.extra_rdoc_files = ["CHANGELOG", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/platform.rb", "lib/echoe.rb", "LICENSE", "README", "TODO"]
Expand Down
2 changes: 1 addition & 1 deletion lib/echoe.rb
Expand Up @@ -234,7 +234,7 @@ def initialize(name, _version = nil)
rescue Errno::ENOENT
unless ARGV.include? "manifest"
puts "Missing manifest. You can build one with 'rake manifest'."
exit
exit 1
else
self.files = []
end
Expand Down

0 comments on commit f6e0e74

Please sign in to comment.