Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
16d2602efe
2 changed files with 3 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
PCPartPicker (excluding lib/DatabasePCStore.jar)
|
ESTRABA (excluding lib/jGPX.jar)
|
||||||
Copyright (c) 2016 Jesús Vélez Palacios, Carlos Santiago Galindo Jiménez
|
Copyright (c) 2016 Jesús Vélez Palacios, Carlos Santiago Galindo Jiménez
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# PCPartPicker
|
# ESTRABA
|
||||||
ETSINF 2016 - IPC Assignment
|
ETSINF 2016 - IPC Assignment
|
||||||
[Carlos Santiago Galindo Jiménez](https://github.com/kauron)
|
[Carlos Santiago Galindo Jiménez](https://github.com/kauron)
|
||||||
[Jesús Vélez Palacios](https://github.com/baudlord)
|
[Jesús Vélez Palacios](https://github.com/baudlord)
|
||||||
|
|
||||||
Icons by [Icons8](https://icons8.com)
|
Icons by [Icons8](https://icons8.com)
|
||||||
|
|
Reference in a new issue