Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents f01bff4 + b7bf609 commit b96fb097e4006a54071f039d61879f6bc01fc3a4 @citizen428 citizen428 committed Jul 12, 2012
Showing with 5 additions and 5 deletions.
  1. +2 −2 LICENSE
  2. +2 −2 kraken-build.gemspec
  3. +1 −1 lib/kraken-build/version.rb
View
4 LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 at
+Copyright (c) 2012 Andreas Tiefenthaler, Michael Kohl
MIT License
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
4 kraken-build.gemspec
@@ -2,8 +2,8 @@
require File.expand_path('../lib/kraken-build/version', __FILE__)
Gem::Specification.new do |gem|
- gem.authors = ["at"]
- gem.email = ["at@an-ti.eu"]
+ gem.authors = ["Andreas Tiefenthaler", "Michael Kohl"]
+ gem.email = ["at@an-ti.eu", "citizen428@gmail.com"]
gem.description = %q{A simple tool that generates a job for each github branch in your Jenkins environment}
gem.summary = %q{Managing your feature branches on Jenkins and Github}
gem.homepage = "https://github.com/pxlpnk/kraken-build"
View
2 lib/kraken-build/version.rb
@@ -1,5 +1,5 @@
module Kraken
module Build
- VERSION = "0.0.1"
+ VERSION = "0.0.2"
end
end

0 comments on commit b96fb09

Please sign in to comment.