version bump to rc2

changelog.md

@@ -1,3 +1,11 @@
+### v1.0.0-rc2 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.0.0-rc1...v1.0.0-rc2)
+
+* AMD build
+  * Added Backbone.BabySitter to the AMD dependency list
+
+* CollectionView / CompositeView
+  * Fixed the `onShow` callbacks, so they can be used in the `initialize` method
+
 ### v1.0.0-rc1 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.0.0-beta6...v1.0.0-rc1)
 
 * Fixed IE < 9 support w/ calls to `.apply` when `arguments` was null or undefined

component.json

@@ -3,7 +3,7 @@
   "description" : "Make your Backbone.js apps dance with a composite application architecture!",
   "url"         : "http://marionettejs.org",
   "main"        : "./lib/backbone.marionette.js",
-  "version"     : "1.0.0-rc1",
+  "version"     : "1.0.0-rc2",
 
   "keywords"     : [
     "backbone",

grunt.js

@@ -9,19 +9,20 @@ module.exports = function(grunt) {
     pkg: '<json:package.json>',
     meta: {
       version: '<%= pkg.version %>',
-      core_banner: '/*!\n' +
-              ' * Backbone.Marionette, v<%= meta.version %>\n' +
-              ' * Copyright (c)<%= grunt.template.today("yyyy") %> Derick Bailey, Muted Solutions, LLC.\n' +
-              ' * Distributed under MIT license\n' +
-              ' * http://github.com/marionettejs/backbone.marionette\n' +
-              '*/',
+      core_banner: 
+              ' // Backbone.Marionette, v<%= meta.version %>\n' +
+              ' // Copyright (c)<%= grunt.template.today("yyyy") %> Derick Bailey, Muted Solutions, LLC.\n' +
+              ' // Distributed under MIT license\n' +
+              ' // http://github.com/marionettejs/backbone.marionette\n',
       banner :
         '<%= meta.core_banner %>\n' +
         '/*!\n' +
         ' * Includes BabySitter\n' +
         ' * https://github.com/marionettejs/backbone.babysitter/\n' +
+        ' * ' + 
         ' * Includes Wreqr\n' +
         ' * https://github.com/marionettejs/backbone.wreqr/\n' +
+        ' * ' + 
         ' * Includes EventBinder\n' +
         ' * https://github.com/marionettejs/backbone.eventbinder/\n' +
         ' */'

license.txt

@@ -1,7 +1 @@
-// Backbone.Marionette v1.0.0-rc1
-//
-// Copyright (C)2012 Derick Bailey, Muted Solutions, LLC
-// Distributed Under MIT License
-//
-// Documentation and Full License Available at:
-// http://github.com/marionettejs/backbone.marionette
+MarionetteJS is distributed under [MIT license](http://mutedsolutions.mit-license.org/).

package.json

@@ -1,7 +1,7 @@
 {
   "name": "Backbone.Marionette",
   "description": "Make your Backbone.js apps dance with a composite application architecture!",
-  "version": "1.0.0-rc1",
+  "version": "1.0.0-rc2",
   "homepage": "https://github.com/marionettejs/backbone.marionette",
   "keywords": [
     "backbone",