Skip to content

Commit

Permalink
Merge pull request #3 from ksbeattie/master
Browse files Browse the repository at this point in the history
Changes for OS release
  • Loading branch information
bijujacob authored Mar 29, 2018
2 parents 6c9090c + 745d8af commit 709bd70
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 41 deletions.
26 changes: 11 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
# APCFramework
Unified framework in MATLAB for application and testing of advanced control algorithms towards efficient operation and control of carbon-capture processes

## Development Practices
## Getting Started
See installation and user guide documents in the [documentation](docs) subdirectory.

* Code development will be peformed in a forked copy of the repo. Commits will not be
## Authors
* Priyadarshi Mahapatra
* Stephen Zitney

See also the list of [contributors](../../contributors) who participated in this project.

## Development Practices
* Code development will be performed in a forked copy of the repo. Commits will not be
made directly to the repo. Developers will submit a pull request that is then merged
by another team member, if another team member is available.
* Each pull request should contain only related modifications to a feature or bug fix.
* Sensitive information (secret keys, usernames etc) and configuration data
(e.g database host port) should not be checked in to the repo.
* A practice of rebasing with the main repo should be used rather that merge commmits.

## Getting Started

TBD

## Authors

* Priyadarshi Mahapatra
* Stephen Zitney

See also the list of [contributors](https://github.com/CCSI-Toolset/APCFramework/contributors) who participated in this project.

## Versioning

We use [SemVer](http://semver.org/) for versioning. For the versions available,
see the [tags on this repository](https://github.com/APCFramework/tags).
[releases](../../releases) or [tags](../../tags) on this repository.

## License & Copyright

Expand Down
Binary file added docs/CCSI_APC_Framework_User_Manual.docx
Binary file not shown.
Binary file added docs/CCSI_APC_Framework_User_Manual.pdf
Binary file not shown.
26 changes: 0 additions & 26 deletions jenkins_description.html

This file was deleted.

0 comments on commit 709bd70

Please sign in to comment.