Skip to content

Commit

Permalink
Version 1.17.1
Browse files Browse the repository at this point in the history
Fix broken merge of dev 1.17.0-dev.6.4 to stable 1.17.0.
  • Loading branch information
whesse committed Jun 6, 2016
1 parent 221f37b commit 1c11253
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions runtime/vm/os_thread.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,6 @@ class OSThread : public BaseThread {
// called when the retunred id will eventually be passed to OSThread::Join().
static ThreadJoinId GetCurrentThreadJoinId(OSThread* thread);

// This function can be called only once per OSThread, and should only be
// called when the retunred id will eventually be passed to OSThread::Join().
static ThreadJoinId GetCurrentThreadJoinId(OSThread* thread);

// Called at VM startup and shutdown.
static void InitOnce();

Expand Down

1 comment on commit 1c11253

@whesse
Copy link
Contributor Author

@whesse whesse commented on 1c11253 Jun 8, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit, labeled 1.17.1, did not have the tools/VERSION file updated, so it built as 1.17.0. We have tagged it as 1.17.0, and released it as 1.17.0

Please sign in to comment.