diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-03-12 12:47:14 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-03-12 12:47:14 +0400 |
| commit | e69642cbe076d0ce343b2acfb149bd2f3b9856d3 (patch) | |
| tree | 5e359380ec8aa092b3c6b93bd0337bb3b834afbe /main/external | |
| parent | 9d20568ee73880bfff7a69b86b0e97ed09d166d1 (diff) | |
| parent | e85ba34d625352a886cce76f2301481b6ffcc272 (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
version-checks
Diffstat (limited to 'main/external')
| m--------- | main/external/nrefactory | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/main/external/nrefactory b/main/external/nrefactory -Subproject c5ca3ac73640dbb7d2ed8c689097c27c6b16eb1 +Subproject a35eafbb5de2b87c106564e77afbe42af9cbb78 |