merge changes from master: new spec sheets, updated .gitattributes

Former-commit-id: 820991a Former-commit-id: ee44d0e
cswelch · Jun 24, 2016 · 88afa2f · 88afa2f
2 parents b0762a7 + 48a9692
commit 88afa2f
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -15,3 +15,7 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+# Documentation directories
+doc/javadoc/* linguist-documentation
+SwerveRoboticsLibrary/doc/* linguist-documentation
diff --git a/SwerveRoboticsLibrary/doc/reference/BST_BNO055_DS000_13.pdf b/SwerveRoboticsLibrary/doc/reference/BST_BNO055_DS000_13.pdf
diff --git a/SwerveRoboticsLibrary/doc/reference/BST_BNO055_DS000_13.pdf.REMOVED.git-id b/SwerveRoboticsLibrary/doc/reference/BST_BNO055_DS000_13.pdf.REMOVED.git-id
diff --git a/SwerveRoboticsLibrary/doc/reference/MATRIX-Controller-Specification-v1.2.pdf b/SwerveRoboticsLibrary/doc/reference/MATRIX-Controller-Specification-v1.2.pdf
diff --git a/SwerveRoboticsLibrary/doc/reference/MATRIX_Motor_Spec_v2.pdf b/SwerveRoboticsLibrary/doc/reference/MATRIX_Motor_Spec_v2.pdf
diff --git a/SwerveRoboticsLibrary/doc/reference/TCS34725.pdf b/SwerveRoboticsLibrary/doc/reference/TCS34725.pdf
diff --git a/SwerveRoboticsLibrary/doc/reference/TMD3782_Datasheet_EN_v2.pdf b/SwerveRoboticsLibrary/doc/reference/TMD3782_Datasheet_EN_v2.pdf
diff --git a/doc/tutorial/Build guide for k9bot.pdf b/doc/tutorial/Build guide for k9bot.pdf
diff --git a/doc/tutorial/Build guide for k9bot.pdf.REMOVED.git-id b/doc/tutorial/Build guide for k9bot.pdf.REMOVED.git-id
diff --git a/doc/tutorial/FTCTraining_Manual.pdf b/doc/tutorial/FTCTraining_Manual.pdf
diff --git a/doc/tutorial/FTCTraining_Manual.pdf.REMOVED.git-id b/doc/tutorial/FTCTraining_Manual.pdf.REMOVED.git-id