Commits · b77357030fabcebe791aae641846594595b34134 · open-source / annotate

21 Mar, 2012 1 commit
- Updating authorship. · b7735703
  Jon Frisby authored Mar 21, 2012
  
  b7735703
01 Mar, 2012 39 commits
- Resolve conflict between generated rakefile and CLI tool. · 918bc420
  Jon Frisby authored Mar 01, 2012
  
  918bc420
- Minor fixups. · 9d52904a
  Jon Frisby authored Mar 01, 2012
  
  9d52904a
- Merge remote-tracking branch 'brentgreeff/master' into development · f5c1aa0f
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	annotate.gemspec
	lib/annotate.rb
	lib/annotate/annotate_models.rb
	lib/tasks/annotate_models.rake
	lib/tasks/annotate_routes.rake
```
  f5c1aa0f
- Merge remote-tracking branch 'appsinyourpants/restart' into development · 56e6930e
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate/annotate_models.rb
```
  56e6930e
- Updating readme to be RDoc compliant. · bb88aa6c
  Jon Frisby authored Mar 01, 2012
  
  bb88aa6c
- Merge remote-tracking branch 'appsinyourpants/master' into development · b58a4f71
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.rdoc
	Rakefile
	VERSION.yml
	annotate.gemspec
	bin/annotate_models
	lib/annotate.rb
	lib/annotate/annotate_routes.rb
	lib/tasks/annotate_models.rake
	lib/tasks/annotate_routes.rake
	spec/annotate_models_spec.rb
	spec/spec_helper.rb
```
  b58a4f71
- fixed a few typos · e00810b2
  Jon Frisby authored Mar 01, 2012
```
Conflicts:

	lib/annotate/annotate_models.rb
```
  e00810b2
- Merge remote-tracking branch 'nofxx/master' into development · 79b9821e
  Jon Frisby authored Mar 01, 2012
  
  79b9821e
- Merge remote-tracking branch 'thermistor/netsign' into development · fc6b727c
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	Rakefile
	VERSION.yml
	annotate.gemspec
	lib/tasks/annotate_models.rake
```
  fc6b727c
- Merge remote-tracking branch 'thermistor/master' into development · 2ff1d370
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	Rakefile
	VERSION.yml
	lib/annotate/annotate_models.rb
```
  2ff1d370
- Merge remote-tracking branch 'robertwahler/master' into development · 43520d82
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	README.rdoc
	Rakefile
	annotate.gemspec
	bin/annotate
	lib/annotate/annotate_models.rb
	tasks/migrate.rake
```
  43520d82
- Merge remote-tracking branch 'robbevan/master' into development · 075c125e
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate/annotate_models.rb
```
  075c125e
- Merge remote-tracking branch 'qichunren/master' into development · ab20ee5b
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	README.rdoc
	Rakefile
	annotate.gemspec
	lib/annotate.rb
	lib/tasks/annotate_models.rake
```
  ab20ee5b
- Merge remote-tracking branch 'multikatt/master' into development · 59bac503
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	annotate.gemspec
```
  59bac503
- Merge remote-tracking branch 'gotmayonase/master' into development · a9f61764
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate/annotate_models.rb
```
  a9f61764
- Merge remote-tracking branch 'doubledrones/master' into development · c69f08df
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	Rakefile
	annotate.gemspec
	lib/annotate/annotate_models.rb
	spec/annotate/annotate_models_spec.rb
	todo.txt
```
  c69f08df
- Merge remote-tracking branch 'branch14/master' into development · 4f02f272
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	Rakefile
	VERSION.yml
	annotate.gemspec
	lib/annotate/annotate_models.rb
```
  4f02f272
- Merge remote-tracking branch 'thermistor/for_me' into development · 55984c28
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	Rakefile
	VERSION.yml
```
  55984c28
- Merge remote-tracking branch 'sagework/master' into development · f67b8f1b
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/tasks/annotate_models.rake
```
  f67b8f1b
- Merge remote-tracking branch 'jeremyolliver/dependency_compatibility' into development · 8c6ff2ea
  Jon Frisby authored Mar 01, 2012
  
  8c6ff2ea
- Merge remote-tracking branch 'alexch/master' into development · 5f17dbf7
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	.gitignore
	Gemfile
	History.txt
	Rakefile
	annotate.gemspec
	lib/annotate/annotate_models.rb
	spec/annotate/annotate_models_spec.rb
	spec/spec_helper.rb
	todo.txt
```
  5f17dbf7
- Updating docs to point to this fork. · aa07dc71
  Jon Frisby authored Mar 01, 2012
  
  aa07dc71
- Merge remote-tracking branch 'vickeryj/master' into development · 22ad7220
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate_models.rb
```
  22ad7220
- Update docs. · 66cbd651
  Jon Frisby authored Mar 01, 2012
  
  66cbd651
- Merge remote-tracking branch 'tonyday/master' into development · 75904357
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	.gitignore
	Rakefile
	annotate.gemspec
	bin/annotate
	lib/annotate/annotate_models.rb
	lib/tasks/annotate_models.rake
```
  75904357
- Merge remote-tracking branch 'peterpunk/master' into development · 5f0d3c95
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate/annotate_models.rb
```
  5f0d3c95
- Merge remote-tracking branch 'masa-iwasaki/master' into development · 00622b3d
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	History.txt
	README.rdoc
	Rakefile
	VERSION.yml
	annotate.gemspec
	bin/annotate-rails
```
  00622b3d
- Merge remote-tracking branch 'martinstannard/master' into development · 6ac0df9b
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	.gitignore
	History.txt
	Manifest.txt
	README.rdoc
	Rakefile
	bin/annotate
	lib/annotate.rb
	lib/annotate/annotate_models.rb
	lib/annotate_models.rb
	lib/tasks/annotate.rake
	lib/tasks/annotate_models.rake
	lib/tasks/annotate_routes.rake
	spec/annotate/annotate_models_spec.rb
	spec/annotate_spec.rb
	spec/spec.opts
	spec/spec_helper.rb
```
  6ac0df9b
- Merge remote-tracking branch 'henrik/master' into development · a1736b22
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate_models.rb
```
  a1736b22
- Merge remote-tracking branch 'collectiveidea/master' into development · 4f8a0be6
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate_models.rb
```
  4f8a0be6
- Merge remote-tracking branch 'benlangfeld/master' into development · 3c29b0ac
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	annotate.gemspec
	bin/annotate
	lib/annotate/annotate_models.rb
```
  3c29b0ac
- Merge remote-tracking branch 'amalc/master' into development · 61b2574d
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	.gitignore
```
  61b2574d
- Merge remote-tracking branch 'alexbuijs/master' into development · 18da6a78
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate/annotate_models.rb
```
  18da6a78
- Merge remote-tracking branch 'adamico/master' into development · 5829e243
  Jon Frisby authored Mar 01, 2012
  
  5829e243
- Merge remote-tracking branch 'Satish/master' into development · e417f419
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate_models.rb
```
  e417f419
- Merge remote-tracking branch 'DanCheail/master' into development · 46df45d5
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	annotate_models.gemspec
	bin/annotate
	lib/annotate/annotate_models.rb
	lib/tasks/annotate.rake
```
  46df45d5
- Yep, I'm tired. · f2a6c320
  Jon Frisby authored Feb 29, 2012
  
  f2a6c320
- Revert "Version bump to 0.0.0" · 7a6c6df9
  Jon Frisby authored Feb 29, 2012
```
... I am clearly tired.

This reverts commit 192808b7.
```
  7a6c6df9
- Version bump to 0.0.0 · 192808b7
  Jon Frisby authored Feb 29, 2012
  
  192808b7