Skip to content
Browse files

Merge branch 'master' into development

  • Loading branch information...
2 parents ea2f270 + 60d9cae commit addc1e04595bde42f6a322ddbe3fe56aec0fec64 @inukshuk inukshuk committed Aug 12, 2012
View
1 .rspec
@@ -1,2 +1,3 @@
+--format Fuubar
--color
--require spec_helper.rb
View
1 Gemfile
@@ -2,5 +2,6 @@ source :rubygems
gem 'rake'
gem 'rspec'
+gem 'fuubar'
gem 'nokogiri'
gem 'csl', '1.0.0.pre5'
View
7 Gemfile.lock
@@ -3,6 +3,10 @@ GEM
specs:
csl (1.0.0.pre5)
diff-lcs (1.1.3)
+ fuubar (1.0.0)
+ rspec (~> 2.0)
+ rspec-instafail (~> 0.2.0)
+ ruby-progressbar (~> 0.0.10)
nokogiri (1.5.5)
rake (0.9.2.2)
rspec (2.11.0)
@@ -12,13 +16,16 @@ GEM
rspec-core (2.11.0)
rspec-expectations (2.11.1)
diff-lcs (~> 1.1.3)
+ rspec-instafail (0.2.4)
rspec-mocks (2.11.0)
+ ruby-progressbar (0.0.10)
PLATFORMS
ruby
DEPENDENCIES
csl (= 1.0.0.pre5)
+ fuubar
nokogiri
rake
rspec
View
2 Rakefile
@@ -11,7 +11,7 @@ end
require 'rspec/core'
require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:spec) do |spec|
- spec.rspec_opts = %w{ --require spec_helper.rb --format progress --color }
+ spec.rspec_opts = %w{ --require spec_helper.rb --format Fuubar --color }
end
task :default => [:spec]
View
2 international-union-of-crystallography.csl
@@ -37,7 +37,7 @@
<text variable="publisher"/>
</group>
</macro>
- <macro name="or">
+ <macro name="editor">
<names variable="editor">
<name initialize-with="." and="symbol" delimiter-precedes-last="always"/>
<label form="verb" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
View
0 ...-of-clinical-and-laboratory-investigation → ...clinical-and-laboratory-investigation.csl
File renamed without changes.

0 comments on commit addc1e0

Please sign in to comment.
Something went wrong with that request. Please try again.