Merge branch 'alarming' into make-ruby-installable

pull/4936/head
Nicolas "Pixel" Noble 9 years ago
commit 87a8745ca6
  1. 2
      src/core/surface/alarm.c

@ -1,6 +1,6 @@
/* /*
* *
* Copyright 2015, Google Inc. * Copyright 2015-2016, Google Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

Loading…
Cancel
Save