diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-11-09 18:11:40 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-11-09 18:11:40 +0400 |
| commit | e5c648175d9b0881ed39c261c0de347eb3f398ba (patch) | |
| tree | 76b760c2dbb945b1ca653a081346592dd86ec117 /extras/MonoDevelop.MonoMac/configure | |
| parent | d375d8b76b9da374f91beeaed14b73abd3332217 (diff) | |
| parent | 8a104dd0c7402d62dc574b78ee5c91f69591a99a (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
Diffstat (limited to 'extras/MonoDevelop.MonoMac/configure')
0 files changed, 0 insertions, 0 deletions