Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
zepumph committed Jan 7, 2020
2 parents 7124369 + eec68d7 commit c270ec6
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion js/GravityForceLabA11yStrings.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018-2019, University of Colorado Boulder
// Copyright 2018-2020, University of Colorado Boulder

/**
* Strings for accessible content: alerts and descriptions in the PDOM.
Expand Down
2 changes: 1 addition & 1 deletion js/view/GravityForceLabControlPanel.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, University of Colorado Boulder
// Copyright 2019-2020, University of Colorado Boulder

/**
* A Panel that has control UI for adjusting the sim. This includes radio buttons for the force values display, and a
Expand Down
2 changes: 1 addition & 1 deletion js/view/GravityForceLabKeyboardHelpContent.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018-2019, University of Colorado Boulder
// Copyright 2018-2020, University of Colorado Boulder

/**
* Content for the "Hot Keys and Help" dialog that can be brought up from the sim navigation bar.
Expand Down
2 changes: 1 addition & 1 deletion js/view/GravityForceLabScreenView.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2013-2019, University of Colorado Boulder
// Copyright 2013-2020, University of Colorado Boulder

/**
* The ScreenView that displays the gravity force lab screen.
Expand Down
2 changes: 1 addition & 1 deletion js/view/SpherePositionsDescriptionNode.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, University of Colorado Boulder
// Copyright 2019-2020, University of Colorado Boulder

/**
* Simple PDOM node to hold the two interactive mass spheres.
Expand Down
2 changes: 1 addition & 1 deletion js/view/describers/GravityForceLabRulerDescriber.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, University of Colorado Boulder
// Copyright 2019-2020, University of Colorado Boulder

/**
* This describer is responsible for the descriptions associated with the moveable ruler. Unlike other describers, this
Expand Down

0 comments on commit c270ec6

Please sign in to comment.