awips2/.gitignore
Steve Harris e6ec61b6f7 Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
	.gitignore
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

deleted h5 files
using ss_sync version of java files


Former-commit-id: b38662dcc1 [formerly 6d01784115] [formerly 24059a5b4e] [formerly 24059a5b4e [formerly 9b67525e95]] [formerly b38662dcc1 [formerly 6d01784115] [formerly 24059a5b4e] [formerly 24059a5b4e [formerly 9b67525e95]] [formerly e5b56c99ab [formerly 24059a5b4e [formerly 9b67525e95] [formerly e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 257cd35cdc [formerly 2dbdc945bf] [formerly 73a337bc31] [formerly 0c3ae8c3017c659ccaacc8c121bd6edd68193fbb [formerly 6a444fc4fae979713c005a8d9737369a6bcbce84] [formerly 73a337bc31 [formerly 40d7357165]]]
Former-commit-id: d89198aed7a3b1592eed6138f0d7a06bd6969587 [formerly 9ad2c540c010a2b27f18bb9c98356065c7663bd2] [formerly f8ae79c35c [formerly 21f12bae82]]
Former-commit-id: f8ae79c35c
Former-commit-id: 85d3d96d4c
2012-02-27 15:58:49 -06:00

12 lines
90 B
Text

bin/
.metadata/
ldm/Debug
test-bin/
testbin/
testBin/
bin-test/
*.class
*.pyo
*.o
*.orig