Skip to content

Commit

Permalink
Merge master into release/3
Browse files Browse the repository at this point in the history
--HG--
branch : release
  • Loading branch information
kazssym committed Jun 13, 2020
2 parents 52e6093 + 8214001 commit a5ee08c
Show file tree
Hide file tree
Showing 35 changed files with 3,236 additions and 1,231 deletions.
1 change: 1 addition & 0 deletions .hgtags
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ e479c8a6598e02a88767104be90786cdab92dc62 release-1.2.0
31e1a7cd0dfd075a7fbdeaed8b4068db100ecb4e release/2.0
6c957b4c920fb69551a5c5800fcf427e272b2e4e release/3-alpha.1
c3349e7c9aa5a2f62949984f0ea68d32eeedfb9e release/2.1
4e2a9683b6cafeb8e5ad576c13e6808c5a839d66 release/3-alpha.2
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"request": "launch",
"name": "(gdb) Launch",
"preLaunchTask": "Build",
"program": "${workspaceFolder}/src/xllmnrd",
"program": "${workspaceFolder}/xllmnrd/xllmnrd",
"args": [
"--foreground"
],
"environment": [],
"cwd": "${workspaceFolder}/src",
"cwd": "${workspaceFolder}/xllmnrd",
"MIMode": "gdb",
"setupCommands": [
{
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Kaz Nishimura <kazssym@vx68k.org>
Kaz Nishimura <kazssym@linuxfront.com>
Loading

0 comments on commit a5ee08c

Please sign in to comment.