Gitiles
Code Review Sign In
review.gerrithub.io / Acstylos / wpi-suite / refs/heads/feature/ExtendTaskView
commit2375bf86cf68e8388578bd1f3d801655e4a862cb[log] [tgz]
authorStylos <a.stylos983@Gmail.com>Tue Dec 09 23:22:09 2014 -0500
committerStylos <a.stylos983@Gmail.com>Tue Dec 09 23:22:09 2014 -0500
treef29fca4c4721e9bd99aa601b711b10b9ec8ad6bb
parentbbf4dfd796622637e490befc32b5ed6d27f81374 [diff]
parentca874c9c97dbc78c336f292f665cfa68069b78a6 [diff]
Merge branch 'dev' of https://github.com/Acstylos/wpi-suite into feature/ExtendTaskView

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/presenter/TaskPresenter.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/BucketView.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/MiniTaskView.java
tree: f29fca4c4721e9bd99aa601b711b10b9ec8ad6bb
  1. Core/
  2. DefectTracker/
  3. gradle/
  4. Janeway/
  5. JanewayAPI/
  6. libs/
  7. Network/
  8. PostBoard/
  9. RequirementManager/
  10. TaskManager/
  11. .gitignore
  12. .gitreview
  13. build.gradle
  14. gradlew
  15. gradlew.bat
  16. license-header.py
  17. README.md
  18. settings.gradle
README.md

See the wiki at https://github.com/WPI-Suite/wpi-suite/wiki