2 commits

Author	SHA1	Message	Date
Steve Harris	f1abad69fd	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: 6d3d1066eb [formerly 221a02882a] [formerly b9f4780fcb] [formerly 6d3d1066eb [formerly 221a02882a] [formerly b9f4780fcb] [formerly 23cc9689de [formerly b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]]] Former-commit-id: 23cc9689de Former-commit-id: f3d32f34ce [formerly a85a777232] [formerly 601b02191762801f860cf28b52a200c6e003e7ea [formerly a2e3aabc60]] Former-commit-id: 14ed1eaa2666eb1db1b97a732045d1fc5b864aba [formerly b2999a6d59] Former-commit-id: 3598fb2fcd	2012-02-15 14:39:43 -06:00
Bryan Kowal	7e2690ee90	Issue #22 - merging Windows MSI installer changes into git thinclient branch. ... Former-commit-id: f522b77248 [formerly be61ec82b0] [formerly 48b420cbb2] [formerly f522b77248 [formerly be61ec82b0] [formerly 48b420cbb2] [formerly ff44a81ceb [formerly 48b420cbb2 [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]]] Former-commit-id: ff44a81ceb Former-commit-id: 5368408482 [formerly bddafa475a] [formerly 68d481a3d913cffc25e47fc6f2eae8a4f8628bf1 [formerly 5eb9afeb98]] Former-commit-id: b43548f0f51b0647e84191cf2451632da3f62170 [formerly dd1c5cdee4] Former-commit-id: 28028b9ad3	2012-01-23 12:36:13 -06:00