projects / 3501 / 2015-FRC-Spark / blame
| Commit | Line | Data |
|---|---|---|
| 9c7b88fb D |
1 | <<<<<<< HEAD |
| 2 | ======= | |
| 5203d5b4 | 3 | # -*- mode: gitignore; -*- |
| 4 | *~ | |
| 5 | \#*\# | |
| 6 | .\#* | |
| 9c7b88fb | 7 | >>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5 |
| 284904c7 KZ |
8 | *.pydevproject |
| 9 | .metadata | |
| 10 | .gradle | |
| 11 | bin/ | |
| 12 | tmp/ | |
| 9c7b88fb D |
13 | <<<<<<< HEAD |
| 14 | ======= | |
| c7a54f8e KZ |
15 | build/ |
| 16 | dist/ | |
| 17 | sysProps.xml | |
| 9c7b88fb | 18 | >>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5 |
| 284904c7 KZ |
19 | *.tmp |
| 20 | *.bak | |
| 21 | *.swp | |
| 22 | *~.nib | |
| 23 | local.properties | |
| 24 | .settings/ | |
| 25 | .loadpath | |
| 26 | ||
| 27 | # Eclipse Core | |
| 28 | .project | |
| 29 | ||
| 30 | # External tool builders | |
| 31 | .externalToolBuilders/ | |
| 32 | ||
| 33 | # Locally stored "Eclipse launch configurations" | |
| 34 | *.launch | |
| 35 | ||
| 36 | # CDT-specific | |
| 37 | .cproject | |
| 38 | ||
| 39 | # JDT-specific (Eclipse Java Development Tools) | |
| 40 | .classpath | |
| 41 | ||
| 42 | # Java annotation processor (APT) | |
| 43 | .factorypath | |
| 44 | ||
| 45 | # PDT-specific | |
| 46 | .buildpath | |
| 47 | ||
| 48 | # sbteclipse plugin | |
| 49 | .target | |
| 50 | ||
| 51 | # TeXlipse plugin | |
| 52 | .texlipse | |
| 53 | ||
| 54 | # STS (Spring Tool Suite) | |
| 9c7b88fb | 55 | <<<<<<< HEAD |
| b5f932ec | 56 | .springBeans |
| 9c7b88fb D |
57 | ======= |
| 58 | .springBeans | |
| 59 | >>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5 |