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

2 commits

Author SHA1 Message Date
Steve Harris
b9f4780fcb 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: 0c520ee63a42d53754686f52ffa5b94a0fe4eea1
 2012-02-15 14:39:43 -06:00
Bryan Kowal
48b420cbb2 Issue #22 - merging Windows MSI installer changes into git thinclient branch. 
Former-commit-id: afbdec0abdb020d47c592a37d0d0b78633e7e609
 2012-01-23 12:36:13 -06:00