xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
445 commits 31 branches 40 tags 3.8 GiB
Commit graph

3 commits

Author SHA1 Message Date
Steve Harris
cd4185ef5c 13.1.2-2 baseline 
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
 2013-01-06 14:32:24 -06:00
Steve Harris
a85a777232 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: 221a02882a [formerly b9f4780fcb] [formerly 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]
Former-commit-id: 23cc9689de
Former-commit-id: a2e3aabc60
 2012-02-15 14:39:43 -06:00
Bryan Kowal
bddafa475a Issue #22 - merging Windows MSI installer changes into git thinclient branch. 
Former-commit-id: be61ec82b0 [formerly 48b420cbb2] [formerly ff44a81ceb [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]
Former-commit-id: ff44a81ceb
Former-commit-id: 5eb9afeb98
 2012-01-23 12:36:13 -06:00