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