diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2012-08-19 22:16:12 +0400 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2012-08-19 22:16:12 +0400 |
| commit | e7660ab714ee237ce080eaf14f5ab7f1997bea3f (patch) | |
| tree | 1adbaee8db27325f3bfd99962484cc203c7743b4 /.gitignore | |
| parent | b0b93983f5411ceffc649d44d55093b04ddf802a (diff) | |
| parent | df91992080ee4db293e6f81882e95e72600d9bd8 (diff) | |
| download | trackermap-server-e7660ab714ee237ce080eaf14f5ab7f1997bea3f.tar.gz trackermap-server-e7660ab714ee237ce080eaf14f5ab7f1997bea3f.tar.bz2 trackermap-server-e7660ab714ee237ce080eaf14f5ab7f1997bea3f.zip | |
Merge branch 'master' of https://github.com/williamchitto/traccar into williamchitto-master
Conflicts:
pom.xml
src/org/traccar/Server.java
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..6f3ccb7fa --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*.class +*.*~ +.classpath +.project +.settings/ +target/ |