aboutsummaryrefslogtreecommitdiffhomepage
path: root/package.json
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-01-31 06:25:39 +0100
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-01-31 06:25:39 +0100
commitbf192eff5632213772ea3351f552722741d68e99 (patch)
tree2caecb5a960425ff69a4b68068c66d9d05260c04 /package.json
parent9d476392b7082f0aba187867c0ed873c96f5949f (diff)
parentd5d83aa33f0bab183ea64dea877abf6cdb0ec65a (diff)
Merge branch 'alarming' into make-ruby-installable
Conflicts: tools/run_tests/sources_and_headers.json
Diffstat (limited to 'package.json')
-rw-r--r--package.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/package.json b/package.json
index 264358f0a8..997a5b5116 100644
--- a/package.json
+++ b/package.json
@@ -380,6 +380,7 @@
"src/core/json/json_reader.c",
"src/core/json/json_string.c",
"src/core/json/json_writer.c",
+ "src/core/surface/alarm.c",
"src/core/surface/api_trace.c",
"src/core/surface/byte_buffer.c",
"src/core/surface/byte_buffer_reader.c",