Skip to content

Commit 1ffde8c

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 4bef182 + 0c7107f commit 1ffde8c

File tree

27 files changed

+27
-28
lines changed

27 files changed

+27
-28
lines changed

CREDITS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Hammerspoon is based on Mjolnir by Steven Degutis, which is based on Hydra by Steven Degutis.
1+
Hammerspoon is based on Mjolnir, which is based on Hydra.
22

33
Our maintainers are:
44
* [Chris Jones](https://github.com/cmsj)

extensions/alert/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Released under MIT license.
22

3-
Copyright (c) 2013 Steven Degutis
3+
Copyright (c) 2013-2025
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

extensions/application/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Released under MIT license.
22

3-
Copyright (c) 2013 Markus Engelbrecht, Steven Degutis
3+
Copyright (c) 2013 Markus Engelbrecht
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

extensions/application/libapplication_watcher.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
///
88
/// Watch for application launch/terminate events
99
///
10-
/// This module is based primarily on code from the previous incarnation of Mjolnir by [Markus Engelbrecht](https://github.com/mgee) and [Steven Degutis](https://github.com/sdegutis/).
10+
/// This module is based primarily on code from the previous incarnation of Mjolnir by [Markus Engelbrecht](https://github.com/mgee).
1111

1212

1313
/// hs.application.watcher.launching

extensions/audiodevice/audiodevice.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
---
33
--- Manipulate the system's audio devices
44
---
5-
--- This module is based primarily on code from the previous incarnation of Mjolnir by [Steven Degutis](https://github.com/sdegutis/).
5+
--- This module is based primarily on code from the previous incarnation of Mjolnir.
66
---
77
--- Note:
88
--- * Objects created by this module are distinct from each other - if you fetch an audiodevice and set a watcher on it, then fetch the audiodevice again, the watcher will only be visible from the first object and not the second. To avoid losing reference to watchers, you can store the audiodevice objects in a Lua table.

extensions/battery/battery.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- Battery/power information
44
--- All functions here may return nil, if the information requested is not available.
55
---
6-
--- This module is based primarily on code from the previous incarnation of Mjolnir by [Steven Degutis](https://github.com/sdegutis/).
6+
--- This module is based primarily on code from the previous incarnation of Mjolnir.
77

88

99
local module = require("hs.libbattery")

extensions/battery/libbattery_watcher.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
///
77
/// Watch for battery/power state changes
88
///
9-
/// This module is based primarily on code from the previous incarnation of Mjolnir by [Steven Degutis](https://github.com/sdegutis/).
9+
/// This module is based primarily on code from the previous incarnation of Mjolnir.
1010

1111

1212
// Common Code

extensions/brightness/brightness.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
---
55
--- Home: https://github.com/asmagill/mjolnir_asm.sys
66
---
7-
--- This module is based primarily on code from the previous incarnation of Mjolnir by [Steven Degutis](https://github.com/sdegutis/).
7+
--- This module is based primarily on code from the previous incarnation of Mjolnir.
88

99
-- try to load private framework for brightness controls
1010
local state, msg = package.loadlib(

extensions/caffeinate/libcaffeinate_watcher.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/// Watch for display and system sleep/wake/power events
99
/// and for fast user switching session events.
1010
///
11-
/// This module is based primarily on code from the previous incarnation of Mjolnir by [Steven Degutis](https://github.com/sdegutis/).
11+
/// This module is based primarily on code from the previous incarnation of Mjolnir.
1212

1313

1414
/// hs.caffeinate.watcher.systemDidWake

extensions/chooser/chooser.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- Graphical, interactive tool for choosing/searching data
44
---
55
--- Notes:
6-
--- * This module was influenced heavily by Choose, by Steven Degutis (https://github.com/sdegutis/choose)
6+
--- * This module was influenced heavily by Choose
77

88
require("hs.styledtext")
99
require("hs.drawing.color")

0 commit comments

Comments
 (0)