Skip to content

Commit

Permalink
Merge pull request #28 from giv-lab/updating-author-credits
Browse files Browse the repository at this point in the history
fixing author credits
  • Loading branch information
lakinwecker committed Nov 30, 2019
2 parents 34bf66f + 7f83251 commit 4e0aac4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
Primary Authors:

Lakin Wecker <lakin.wecker@ucalgary.ca>
Andrew Owens <arowens@ucalgary.ca>
Jeremy Hart <hartja@ucalgary.ca>
Przemyslaw Prusinkiewicz <pwp@ucalgary.ca>
Andrew Owens <arowens@ucalgary.ca>
Kathleen Ang <kdang@ucalgary.ca>

With guidance from:
Przemyslaw Prusinkiewicz <pwp@ucalgary.ca>

6 changes: 3 additions & 3 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Welcome to GIVR's documentation!
================================

givr is a GPLv3 licensed, type-safe API for rendering geometry. It was
primarily developed by Lakin Wecker, Jeremy Hart, Andrew Owens, Kathleen Ang
and Dr. Przemyslaw Prusinkiewicz for use in CPSC 587 - Computer Animation
at the University of Calgary.
primarily developed by Lakin Wecker, Jeremy Hart, Andrew Owens, Kathleen
Ang with guidance from Dr. Przemyslaw Prusinkiewicz. It was developed for
use in CPSC 587 - Computer Animation at the University of Calgary.

Computer graphics programs are incredibly rewarding. Not only do you get
immediate feedback about your program when you run it, the results are
Expand Down

0 comments on commit 4e0aac4

Please sign in to comment.