Lines Matching refs:Merge
50 Merge: 332a539 247a5e7
54 Merge branch 'master' of github.com:libffi/libffi
215 Merge: d087b59 73dd43a
219 Merge branch 'master' of github.com:libffi/libffi
829 Merge: 05a1796 a7d6396
833 Merge pull request #482 from sharkcz/aarch64
927 Merge: 737d4fa 2c5b164
931 Merge pull request #461 from NativeScript/bektchiev/fix-visibility-hidden-check-in-configure
942 Merge: a5ea752 4a84df4
946 Merge pull request #457 from NativeScript/bektchiev/fix-arm64-q3-q4-args
959 Merge: b11b08c ba73a67
963 Merge pull request #443 from jeremyhu/master
968 Merge: 980908b e6eac78
972 Merge pull request #449 from gpakosz/align-macros
983 Merge: 65da63a 4cb776b
987 Merge pull request #445 from andreas-schwab/master
1181 Merge: 8e250c3 b69f95d
1185 Merge pull request #429 from yousong/m4subst
1272 Merge: e27f70b 801c1bd
1276 Merge branch 'master' of github.com:/libffi/libffi
1598 Merge: 43980dd 9bc40d8
1602 Merge branch 'master' of github.com:/libffi/libffi
1948 Merge: 83d9aba 11de69d
1952 Merge pull request #406 from trofi/master
1957 Merge: ab15405 b58caef
1961 Merge pull request #407 from trofi/ia64-small-struct
1966 Merge: 9429968 e66fd67
1970 Merge pull request #409 from andreas-schwab/master
2133 Merge: f08b2be 28d3b61
2137 Merge pull request #403 from frida/fix/x86-sysv-pic-closure-regression
2142 Merge: c194448 482b37f
2146 Merge pull request #405 from andreas-schwab/master
2182 Merge: f6ecf10 d15581c
2186 Merge pull request #393 from thejunkjon/master
2191 Merge: c50ba18 746dbe3
2195 Merge pull request #401 from wzssyqa/jr-r6
2208 Merge: 54cb3e2 af6949b
2212 Merge pull request #398 from emaste/master
2217 Merge: 716bfd8 94c102a
2221 Merge pull request #396 from wzssyqa/master
2250 Merge: 4fdbb05 cd5e9f8
2254 Merge pull request #387 from trofi/master
2282 Merge: b302bc3 2bfcd29
2286 Merge pull request #320 from 0-wiz-0/master
2291 Merge: 14eac93 1fb788a
2295 Merge pull request #322 from compnerd/aarch64-base
2300 Merge: ad15ae7 9fc9dc5
2304 Merge pull request #384 from yan12125/fix-sgidefs-checking
2324 Merge: dc2ff5b 5e4fcdc
2328 Merge pull request #298 from frida/fix/ios-trampoline-table-complexity
2333 Merge: 927da71 79d1509
2337 Merge pull request #323 from compnerd/x86-alloca-alignment
2342 Merge: a0455c0 181fc4c
2346 Merge pull request #379 from jlj/master
2351 Merge: 0faf614 9d9d92b
2355 Merge pull request #383 from hjl-tools/hjl/master
2360 Merge: 8d26e8c 3c372c3
2364 Merge pull request #381 from compnerd/ffi-nullptr-deref
2401 Merge: 8d26e8c 54529ba
2405 Merge branch 'master' based on ksjogo/libffi
2431 Merge: 1c9171e ed7488c
2435 Merge pull request #326 from trofi/master
2470 Merge: 9f1f874 7ad0ae7
2474 Merge pull request #324 from compnerd/arm-zext
2502 Merge: dca078f 6cf0dea
2506 Merge pull request #319 from angerman/patch-5
2517 Merge: 540258d bccba9a
2521 Merge pull request #316 from angerman/patch-2
2526 Merge: 93d8e7d 4c6aa78
2530 Merge pull request #317 from angerman/patch-3
2535 Merge: a1e6ccb 59d65d7
2582 Merge: 10099d6 7d504f7
2586 Merge pull request #263 from ksjogo/master
2591 Merge: c8f1aa3 ed84883
2595 Merge pull request #271 from frida/fix/qnx-cache-flushing
2600 Merge: db4dad9 50e408c
2604 Merge pull request #307 from zw3rk/master
2609 Merge: 8a16f2f 9c12209
2613 Merge pull request #312 from fjricci/fix_ub
2618 Merge: b230910 0ff9419
2622 Merge pull request #308 from trex58/master
2643 Merge: c0cc9f1 9c6cb58
2647 Merge pull request #309 from rurban/oldgcc
2699 Merge: b841ae7 bd72848
2703 Merge pull request #302 from gpakosz/align-macros
2783 Merge: fa5a0fe 1e0d107
2787 Merge pull request #291 from ramon-garcia/visual-studio-build
2792 Merge: 5b91bbd bfab429
2796 Merge pull request #238 from KubaKaszycki/master
2801 Merge: d754c51 982b89c
2805 Merge pull request #288 from yan12125/std-includedir
2810 Merge: ebe7f44 41185b5
2814 Merge pull request #299 from matijaskala/patch-1
2858 Merge: dabbd14 d42ce7b
2862 Merge pull request #297 from frida/fix/error-path
2885 Merge: 60e4250 6caabd1
2889 Merge pull request #295 from terrillmoore/patch-1
2932 Merge: 2ded2a4 52a11f6
2936 Merge pull request #273 from wbx-github/master
2941 Merge: 408c9c7 e247b56
2945 Merge pull request #272 from yousong/mips64-soft-float
2950 Merge: 06d7c51 b545ff8
2954 Merge pull request #274 from dr-hannibal/ykolerov-unused
3000 Merge: aa7ed78 301166b
3004 Merge pull request #269 from frida/fix/aarch64-variadic-closures-on-ios
3009 Merge: 1daa787 4da814b
3013 Merge pull request #268 from frida/fix/aarch64-large-aggregates
3027 Merge: f03ba20 5e9ac7e
3031 Merge pull request #270 from frida/fix/aarch64-warnings
3063 Merge: 40e4063 ef8be84
3067 Merge pull request #266 from dr-hannibal/arc-pthread
3114 Merge: c0829e6 cf4b2a5
3118 Merge pull request #261 from tromey/fix-260
3131 Merge: 96d9bf4 794a54d
3135 Merge pull request #259 from rth7680/master
3146 Merge: 02089a1 52fbd12
3150 Merge pull request #253 from iains/darwin-build
3183 Merge: 5d0365c c884551
3187 Merge pull request #237 from tschwinge/libffi_feature_test
3192 Merge: 584a140 74b3f52
3196 Merge pull request #251 from berkerpeksag/delete-test-define
3211 Merge: c617754 b3496de
3215 Merge pull request #248 from berkerpeksag/patch-1
3226 Merge: 9edaa69 33d9a31
3230 Merge pull request #247 from rth7680/symver
3241 Merge: 0969a1c 8a0a4e2
3245 Merge pull request #230 from rth7680/symver
3250 Merge: 571b1ca 4a677a4
3254 Merge pull request #232 from berkerpeksag/signcompare
3259 Merge: 069d2e4 1e82e1c
3263 Merge pull request #233 from berkerpeksag/mremap
3268 Merge: a44a5b8 1b4f5ee
3272 Merge pull request #246 from berkerpeksag/update-github-links
3314 Merge: 9443eae 2627fc9
3318 Merge pull request #234 from berkerpeksag/disable-docs
3323 Merge: 14be9a1 e169ba2
3327 Merge pull request #242 from somasis/master
3352 Merge: 1cea273 b50eabf
3356 Merge pull request #245 from rth7680/tromey-ffi-prep-cif-core-is-private
3387 Merge: 48bfae1 6aafb56
3391 Merge pull request #231 from berkerpeksag/simplfy-oserror
3396 Merge: 6d87110 d76975d
3400 Merge pull request #236 from andreas-schwab/master
3405 Merge: 9de24a3 e5843a3
3409 Merge pull request #241 from rth7680/fix-win64
3472 Merge: ee71806 38a4d72
3476 Merge pull request #212 from tromey/struct-layout
3495 Merge: f2f234a e59fb55
3499 Merge pull request #227 from tromey/fix-documentation-build
3534 Merge: 49b95ed fa7a257
3538 Merge pull request #190 from havardgraff/master
3543 Merge: 415723b 43fc5bc
3547 Merge pull request #194 from amodra/master
3552 Merge: 7c27fcb 1f6b5a9
3556 Merge pull request #104 from joshtriplett/efi64
3561 Merge: 69143d0 e061243
3565 Merge pull request #199 from Pan7/master
3570 Merge: 755f1e6 505346e
3574 Merge pull request #197 from foxsen/mips_go_closure
3579 Merge: 183ee6a 4cdedc2
3583 Merge pull request #193 from rth7680/fix-70
3588 Merge: 0bb71b5 877ea9b
3592 Merge pull request #206 from edolnx/master
3597 Merge: 296a283 8bec5ca
3601 Merge pull request #211 from tromey/move-prep-types-out-of-ffi.h
3606 Merge: e7c713a 4805bf9
3610 Merge pull request #213 from tromey/remove-FFI_TYPE
3615 Merge: 79666ab f45e9e3
3619 Merge pull request #214 from tromey/document-enum-support
3624 Merge: 20c7c31 89b7605
3628 Merge pull request #205 from filbranden/tool_opts
3633 Merge: 6ba2a49 9c14cbf
3637 Merge pull request #225 from ehsan/safeseh
3671 Merge: 8005600 6a3a6ac
3675 Merge pull request #222 from freakboy3742/t181
3680 Merge: 70594f7 5e2b18a
3684 Merge pull request #224 from plicease/travis
3695 Merge: bc4fc07 70594f7
3699 Merge branch 'master' into t181
3711 Merge: 88deacd 6affad7
3715 Merge pull request #221 from tromey/document-closure-ffi_arg
3756 Merge: 2a988c4 473bcbc
3760 Merge pull request #209 from tromey/documentation-updates
3765 Merge: e9de7e3 ff33ddd
3769 Merge pull request #207 from tromey/deprecate-ffi-prep-closure
3821 Merge: d19b6cc 0ebde2d
3825 Merge pull request #202 from tromey/note-prep-cif-var-usage
3830 Merge: 17ffc36 36f3fb9
3834 Merge pull request #201 from tromey/fix-texinfo-buglet
3972 Merge: 173757c a5b3eaa
3976 Merge pull request #185 from freakboy3742/t184
3981 Merge: f5ec627 dd9e4c8
3985 Merge pull request #186 from freakboy3742/gitignore
4002 Merge: 06747d3 95df379
4006 Merge pull request #178 from rth7680/aa64-ilp32
4017 Merge: db1b34b 6c53577
4021 Merge pull request #176 from 0-wiz-0/master
4040 Merge: 035715b 2104b2a
4044 Merge pull request #175 from rth7680/sparc
4049 Merge: 31a6185 b0e9796
4053 Merge pull request #174 from rth7680/fbsd
4072 Merge: d6675c1 5363663
4076 Merge pull request #170 from fealebenpae/aarch64-trampoline-table
4081 Merge: a25a46a 3ac1610
4085 Merge pull request #172 from rth7680/fixes
4098 Merge: 5cd411a 1ad0b17
4102 Merge pull request #171 from rth7680/fixes
4185 Merge: 1c61e73 e1a5ddb
4189 Merge pull request #166 from chevah/master
4194 Merge: dd0b59a 3fa5d70
4198 Merge pull request #165 from rth7680/pcc
4203 Merge: 9131039 b7f6d7a
4207 Merge pull request #164 from rth7680/darwin
4212 Merge: 4ca2262 7282d32
4216 Merge pull request #160 from nobu/msvc-no-complex
4221 Merge: 58bf7d6 5f8881a
4225 Merge pull request #159 from nobu/fix-void-arith
4355 Merge: 75b2199 7ba30b1
4359 Merge pull request #158 from rth7680/s390
4412 Merge: 8a3a272 2f65246
4416 Merge pull request #157 from rth7680/x86
4421 Merge: 9ae3bc8 542e004
4425 Merge pull request #156 from rth7680/sparc
4452 Merge: 9ca4370 590663b
4456 Merge pull request #151 from amodra/master
4540 Merge: 5211c72 a9ed0c3
4544 Merge pull request #148 from gpakosz/dlmalloc-preprocessor-fix
4572 Merge: 3316b66 ccdd7bb
4576 Merge pull request #147 from rth7680/go/alpha
4587 Merge: b698638 dea49e2
4591 Merge pull request #145 from rth7680/master
4596 Merge: a353d5b 771fabc
4600 Merge pull request #144 from atrosinenko/testsuite-fp-comparison-fix
4605 Merge: 4aa702a e029c70
4609 Merge pull request #143 from adamkaplan/patch-1
4708 Merge: 20562ac 8d5debc
4712 Merge branch 'rth7680-go-closure'
4721 Merge: 20562ac 0e303c0
4725 Merge branch 'go-closure' of https://github.com/rth7680/libffi into rth7680-go-closure
4987 aarch64: Merge prep_args with ffi_call
5101 Decouple the assembly from FFI_TYPE_*. Merge prep_args with ffi_call,
5252 Merge: 990eb9d 0f316ab
5256 Merge pull request #134 from s-macke/openrisc
5354 * src/types.c (FFI_TYPEDEF, FFI_NONCONST_TYPEDEF): Merge the macros by
5430 Merge: 862f53d 5d6340e
5434 Merge pull request #132 from nielsAD/master
5439 Merge: 5df3840 aebf2c3
5443 Merge pull request #130 from frida/fix/darwin-aarch64-float-alignment
5448 Merge: 7b7a528 0f4e09d
5452 Merge pull request #129 from frida/fix/darwin-aarch64-cif-prep
5457 Merge: 4cd5e84 6172a99
5461 Merge pull request #124 from knuesel/master
5466 Merge: 1cee07b 08853e3
5470 Merge pull request #123 from ehsan/clang-cl
5541 Merge: 69289c1 360aa8c
5545 Merge pull request #122 from rvandermeulen/1014976
5586 Merge: 0403f33 c1166d4
5590 Merge pull request #120 from l0kod/tmpfile
5664 Merge: 1c0e9a7 99909eb
5668 Merge pull request #119 from joshtriplett/fastcall-fastball
5679 Merge: 93a24f2 d369522
5683 Merge pull request #101 from joshtriplett/fastcall-closures
5698 Merge: dd11a04 2349fec
5702 Merge pull request #80 from ueno/devel
5707 Merge: 8fa2812 03ca880
5711 Merge pull request #86 from joshtriplett/testsuite-CC-CXX
5716 Merge: 8a58e6b 419503f
5720 Merge pull request #116 from frida/fix/darwin-aarch64-variadic
5725 Merge: 30b77c5 a539f7f
5729 Merge pull request #115 from frida/fix/darwin-aarch64-alignment
5734 Merge: dc33cb3 3e2b84d
5738 Merge pull request #117 from frida/fix/windows-regression
5763 Merge: c860a99 b5fed60
5767 Merge pull request #114 from joshtriplett/bounce-on-a-tiny-trampoline
5850 Merge: afee537 f0c8a31
5854 Merge pull request #108 from joshtriplett/freebsd
5859 Merge: 7d24785 b2d610e
5863 Merge pull request #106 from joshtriplett/darwin-award
5868 Merge: beab5f3 56be47f
5872 Merge pull request #110 from joshtriplett/w64
5877 Merge: 28fb197 ef5890e
5881 Merge pull request #105 from joshtriplett/win32-relocations
5966 Merge: c697472 c3dd0a1
5970 Merge pull request #107 from rvandermeulen/msvcc
5987 Merge: 83fd2bc e48918e
5991 Merge pull request #102 from joshtriplett/test-generic
6050 Merge: 3658a07 06ff924
6054 Merge pull request #99 from joshtriplett/gitignore
6059 Merge: d948d0a 46c5d3c
6063 Merge pull request #100 from rvandermeulen/bug-756740
6100 Merge: b61b472 a86bd31
6104 Merge pull request #98 from joshtriplett/unconfigure.host
6106 Merge configure.host into configure.ac
6112 Merge configure.host into configure.ac
6124 Merge: 11a5c5c eef2e02
6128 Merge pull request #97 from joshtriplett/remove-more-generated-files
6133 Merge: 9a62a21 1c68c07
6137 Merge pull request #96 from joshtriplett/sawing-changelogs
6174 Merge: 694447a e892e58
6178 Merge pull request #95 from joshtriplett/news
6189 Merge: fdc87f3 45a6c21
6193 Merge pull request #93 from joshtriplett/travis-dist
6204 Merge: 7412b83 e1911f7
6208 Merge pull request #85 from joshtriplett/stdcall
6226 Merge: c0cc5fd 9531d05
6230 Merge pull request #90 from joshtriplett/win32-unifdef
6235 Merge: 98b5296 b3a5da0
6239 Merge pull request #89 from joshtriplett/travis32
6262 Merge: 134ce4c f6dd184
6266 Merge pull request #94 from joshtriplett/esp-extra-stackery-perception
6277 Merge: 2680e9e 9c27932
6281 Merge pull request #91 from joshtriplett/esp-extra-stackery-perception
6300 Merge: 071eab3 82f8cb2
6304 Merge pull request #88 from joshtriplett/such-precision-many-fail-wow
6349 Merge: 2228c7a 2f44952
6353 Merge pull request #92 from joshtriplett/autogen
6364 Merge: 76d19d0 35634db
6368 Merge pull request #87 from joshtriplett/autogen
6381 Merge: c86d9b6 a1a6f71
6388 Merge: 4efb7db f8cdf11
6395 Merge: 634a475 18eb81d
6399 Merge pull request #81 from rvandermeulen/bug-756740
6458 Merge: 11d7aa9 67fbef3
6462 Merge branch 'master' of github.com:/atgreen/libffi
6465 Merge: b40aeda 3b44d41
6469 Merge pull request #46 from makotokato/android-clang
6474 Merge: b40aeda 3b44d41
6478 Merge pull request #46 from makotokato/android-clang
6483 Merge: 20698ab 53ceaf1
6487 Merge branch 'master' of github.com:/atgreen/libffi
6490 Merge: 860fe66 cc9b518
6494 Merge pull request #40 from wojdyr/master
6499 Merge: 64bd069 1a0b01e
6503 Merge pull request #66 from ppizarro/master
6508 Merge: 64bd069 1a0b01e
6512 Merge pull request #66 from ppizarro/master
6523 Merge: 33c9954 3998d26
6527 Merge pull request #75 from joshtriplett/longdouble
6538 Merge: 5a88c85 cc82051
6542 Merge branch 'master' of github.com:/atgreen/libffi
6576 Merge: 51377bd b4df9cf
6597 Merge: f08da54 40927bd
6601 Merge pull request #72 from heiher/devel
6606 Merge: 3dc3f32 fa5f25c
6610 Merge pull request #68 from zeldin/master
6717 Darwin: Merge build scripts, redo project, incl. arm64
6783 Merge: 484a758 07345a3
6787 Merge branch 'master' of github.com:/atgreen/libffi
6808 Merge: 852ac3b bb9740e
6812 Merge branch 'master' of github.com:/atgreen/libffi
6816 Merge: ac75368 4d701e0
6820 Merge pull request #60 from zwaldowski/ios-redo
6961 Merge: ab79d6e ac75368
6965 Merge branch 'master' of github.com:/atgreen/libffi
7009 Merge: 2f45082 aa1f62c
7013 Merge pull request #59 from iains/powerpc-darwin-unwind-fix
7038 Merge: 83f65b6 1fd0457
7042 Merge branch 'master' of github.com:/atgreen/libffi
7142 Merge: 58c2577 f3657da
7146 Merge branch 'master' of https://github.com/bivab/libffi
7220 Merge: c242217 c265b4c
7224 Merge branch 'master' of github.com:/atgreen/libffi
7227 Merge: f4b843f d918d47
7231 Merge pull request #45 from foss-for-synopsys-dwc-arc-processors/arc_support
7236 Merge: f4b843f d918d47
7240 Merge pull request #45 from foss-for-synopsys-dwc-arc-processors/arc_support
7251 Merge: 666f3e7 6aa1590
7255 Merge pull request #51 from vbudovski/for_upstream
7362 Revert "Merge pull request #36 from abergmeier/emscripten_fix"
7368 Merge: b50a13b 587002c
7372 Merge pull request #36 from abergmeier/emscripten_fix
7377 Merge: 767f1f9 b082e15
7381 Merge pull request #44 from foss-for-synopsys-dwc-arc-processors/arc_support
7386 Merge: c3c40e0 b8a91d8
7390 Merge pull request #43 from JensTimmerman/__m128
7431 Merge: ede96e4 4750e3c
7435 Merge pull request #34 from davidsch/armhf
7508 Merge: f22ab3c 9e34992
7512 Merge branch 'master' of github.com:/atgreen/libffi
7515 Merge: 12b1886 d08124b
7519 Merge branch 'master' of github.com:/atgreen/libffi
7522 Merge: 12b1886 d08124b
7526 Merge branch 'master' of github.com:/atgreen/libffi
7553 Merge: 4acf005 d9dd417
7557 Merge branch 'master' of github.com:/atgreen/libffi
7593 Merge: 2fb527a 7e1b326
7597 Merge branch 'master' of github.com:/atgreen/libffi
7606 Merge: f308faf ee18766
7610 Merge pull request #32 from alex/patch-1
7615 Merge: f308faf ee18766
7619 Merge pull request #32 from alex/patch-1
7782 Merge: bada2e3 bcc0c28
7786 Merge pull request #28 from jralls/master
7806 Merge: 1035ffb 840f975
7810 Merge branch 'master' of github.com:/atgreen/libffi
7813 Merge: aeb8719 4086024
7820 Merge: aeb8719 4086024
7824 Merge branch 'master' of github.com:/atgreen/libffi
8033 Merge: 335f419 f6b58d2
8037 Merge pull request #26 from rofl0r/master
8042 Merge: 53236d5 6d6f711
8046 Merge pull request #23 from rurban/master
8125 Merge with GCC. Eliminate quilt bits.
8164 Merge: f342996 fa5d747
8631 Merge: 18dd85d 3000dc2
8635 Merge branch 'master' of https://github.com/landonf/libffi-ios
8680 Merge: 55e4a5a 1fbf9dc
8684 Merge remote branch 'upstream/master'
8746 Merge: cc3fbd9 71c792f
8750 Merge remote branch 'upstream/master'
8753 Merge: e449a43 f6ab3ed
8757 Merge branch 'master' of github.com:landonf/libffi-ios
8904 Merge: bc9d0be f6ab3ed
9493 Merge: cd98813 dcc1f6b
9497 Merge branch 'master' of git@github.com:atgreen/libffi
10367 Merge from gcc
10515 Many many updates. Merge from gcc and then some.
10527 Merge from libgcj. Merged patches from net. See ChangeLog for details.
10684 Merge: d3782ec bc75c54