diff deploy/osx/Info.plist @ 318:124a3ea9fafb easyhg_v0.4

Merge, and add a helpful warning when you try to push before committing your merge (I just did this and the ensuing warning was misleading)
author Chris Cannam
date Wed, 02 Mar 2011 12:38:17 +0000
parents 960b782f0a64
children 0d89746bae1a
line wrap: on
line diff