Steve Harris
|
92084b3f20
|
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]
Former-commit-id: d0bbbfefcc
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
8da36046de
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]
Former-commit-id: c8aae98741
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
221a02882a
|
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]
Former-commit-id: b9f4780fcb
|
2012-02-15 14:39:43 -06:00 |
|
Steve Harris
|
74c156e508
|
Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: a91b01bfbe [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]
Former-commit-id: 5e47f8c33a
|
2012-02-15 12:54:54 -06:00 |
|
Ben Steffensmeier
|
808846e237
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2
Former-commit-id: f65d86a06a [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]
Former-commit-id: 944e59e989
|
2012-02-14 15:46:11 -06:00 |
|
Bryan Kowal
|
4453ad2d10
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: ea1c82452b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]
Former-commit-id: 65e1e4ee0b
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
580e2938d7
|
Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
|
2012-01-19 11:53:12 -06:00 |
|
Bryan Kowal
|
63f6f44fe1
|
Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 9d64e1df12 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]
Former-commit-id: 43c3807a32
|
2012-01-18 16:00:45 -06:00 |
|
root
|
a02aeb236c
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
|
2012-01-06 08:55:05 -06:00 |
|