2 commits

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