diff options
| author | Mark Probst <mark.probst@gmail.com> | 2011-01-25 00:26:45 +0300 |
|---|---|---|
| committer | Mark Probst <mark.probst@gmail.com> | 2011-01-25 00:26:45 +0300 |
| commit | e097a6443206bcdf9866e0c65883ece765144d02 (patch) | |
| tree | 117233db4d00fbbc2369b81432a2b1b346532c11 /configure.in | |
| parent | e9d51317d810ffbe4f58151019d4525045a8bbfd (diff) | |
| parent | ff955b463f0f15e7dd4d3df9c7c9d79ba1388eef (diff) | |
Merge branch 'sgen-android'
Conflicts:
mono/metadata/sgen-gc.c
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 3843e74b1fb..8ab977a07d0 100644 --- a/configure.in +++ b/configure.in @@ -2876,6 +2876,7 @@ data/net_4_0/Makefile data/net_2_0/Browsers/Makefile data/mint.pc data/mono-2.pc +data/monosgen-2.pc data/mono.pc data/mono-cairo.pc data/mono-nunit.pc |