Skip to content

Commit

Permalink
Merge pull request #153 from panix-os/dev
Browse files Browse the repository at this point in the history
Development Merge into Stable - Winter 2020-2021
  • Loading branch information
micahswitzer authored Dec 30, 2020
2 parents c2dfff8 + cb812e6 commit 5b241aa
Show file tree
Hide file tree
Showing 74 changed files with 2,839 additions and 974 deletions.
12 changes: 2 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,23 @@
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

# Ignore all object and archive files
*.[oa]
*.bin
*.raw
*.elf
.DS_Store

# Ignore build directories
# Ignore build output
obj/
dist/
tests/run_tests

# Serial Output
com1.txt
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "libs/liballoc"]
path = libs/liballoc
url = https://github.com/panix-os/liballoc.git
branch = panix
2 changes: 1 addition & 1 deletion .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"compilerPath": "/usr/bin/gcc",
"includePath": [
"${default}",
"${workspaceFolder}/sysroot/usr/include/kernel"
"${workspaceFolder}/sysroot/usr/include/kernel/**"
],
"cStandard": "c11",
"cppStandard": "c++17",
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Keeton "Auxel" Feavel
Copyright (c) 2019 Keeton "Auxel" Feavel, Micah Switzer, & The Panix Contributors.

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

0 comments on commit 5b241aa

Please sign in to comment.