Commit graph

6 commits

Author SHA1 Message Date
Bryan Kowal
65f487cb9a Issue #1915 - Java 1.6u43 for MSFT Windows
Change-Id: I55e6dcba097ee694a5a4aacb311c85052c2f663d

Former-commit-id: 127a2bd489 [formerly e9ae5b5d30cc1c5283aa947ed02b4d35c3cf3460]
Former-commit-id: a2ad4d4d58
2013-04-22 16:41:37 -05:00
Steve Harris
47cc08ac79 13.2.1-2 baseline
Former-commit-id: 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 328c6dccad
2013-01-23 11:18:44 -05:00
Steve Harris
941337c553 13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: 4ba416aeb3
2013-01-06 14:32:24 -06:00
Steve Harris
a4e519f3cd 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
2012-04-18 15:18:16 -05:00
Steve Harris
a2e3aabc60 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: b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]
Former-commit-id: 23cc9689de
2012-02-15 14:39:43 -06:00
Bryan Kowal
5eb9afeb98 Issue #22 - merging Windows MSI installer changes into git thinclient branch.
Former-commit-id: 48b420cbb2 [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]
Former-commit-id: ff44a81ceb
2012-01-23 12:36:13 -06:00