Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 44a01cddde85
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 20eb0466822e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 24, 2019

  1. Changes that I want to keep.

    pleroy committed Mar 24, 2019
    Copy the full SHA
    651e972 View commit details
  2. Merge pull request #2106 from pleroy/Replay

    Fix minor issues found when debugging the MapNodes
    pleroy authored Mar 24, 2019
    Copy the full SHA
    20eb046 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 journal/player_test.cpp
  2. +1 −1 ksp_plugin/ksp_plugin.vcxproj.filters
4 changes: 2 additions & 2 deletions journal/player_test.cpp
Original file line number Diff line number Diff line change
@@ -102,9 +102,9 @@ TEST_F(PlayerTest, DISABLED_Debug) {
}
LOG(ERROR) << count << " journal entries in total";
LOG(ERROR) << "Last successful method in:\n"
<< player.last_method_in().DebugString();
<< player.last_method_in().DebugString();
LOG(ERROR) << "Last successful method out/return: \n"
<< player.last_method_out_return().DebugString();
<< player.last_method_out_return().DebugString();

#if 0
serialization::Method method_in;
2 changes: 1 addition & 1 deletion ksp_plugin/ksp_plugin.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="iterators_body.hpp">
<Filter>Header Files</Filter>
<Filter>Source Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>