[cogl] (45 commits) Non-fast-forward update to branch cogl.windows.fixes



The branch 'cogl.windows.fixes' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  4c0299a... cogl-winsys-sdl2.c: Fix running on 32-bit Windows
  2fff65e... cogl/cogl.c: Do not hardcode COGL_LOCALEDIR on Windows
  b9ee85d... cogl/cogl-bitmask.h: Use size_t instead of unsigned long
  f99994e... cogl-crate.c: Fix running on 64-bit Windows
  f51c248... cogl/cogl-debug.h: Export and properly use _cogl_debug_inst

Commits added to the branch:

  fdc8de9... primitive: Fix syntax on annotations type (*)
  ca9db0b... cogl/deprecated/cogl-fixed.h: Use "static inline" instead G (*)
  a9f34bd... Merge branch 'jjardon/static_inline' into 'cogl-1.22' (*)
  df47776... Merge branch 'cogl-1.22' into 'cogl-1.22' (*)
  60015d7... Release Cogl 1.22.4 (*)
  9bc253e... Post-release version bump to 1.22.5 (*)
  d71b270... Update Italian translation (*)
  c182a13... Update Catalan translation (*)
  73abb69... Update Hungarian translation (*)
  7c7239e... Add fallback for semi-private symbols in Pango (*)
  b336445... Update Russian translation (*)
  d0bb2ef... Update German translation (*)
  b7915c4... Add Finnish translation (*)
  0f5f317... test-premult: Don't free texture data until CoglBitmap is f (*)
  3fd7741... gst, pango: Add missing pkg-config dependencies (*)
  ec3d788... cogl-pango-2.0-experimental.pc: Reference correct library n (*)
  f073630... Add Malay translation (*)
  6f19dff... Merge branch 'wip/smcv/fix-pkg-config-1.22' into 'cogl-1.22 (*)
  dd10479... Release Cogl 1.22.6 (*)
  9534246... Post-release version bump to 1.22.7 (*)
  d205b8b... Merge branch 'wip/smcv/test-premult-use-after-free-1.22' in (*)
  fb1acfe... Fix building against libglvnd-provided EGL headers (*)
  82a9e86... Terminate tests with SIGALRM if they take more than 120 sec (*)
  2e7271a... Normally skip tests that are not expected to succeed (*)
  ab9a62b... tests: Use tmp file to dump test results (*)
  bd2ff3a... tests: Show the actual output from tests if VERBOSE is set (*)
  49ef0aa... autogen.sh: Stop checking for specific versions of Automake (*)
  9ffbe1e... tests: Force defined behaviour for 24-bit left-shifts (*)
  f0e571a... gles: Reassure compiler that uninitialized variables are no (*)
  fc8b269... tests: Reassure compiler that uninitialized variables are n (*)
  ff5dfc6... Merge branch 'cherry-pick-9c476422' into 'cogl-1.22' (*)
  2243138... Merge branch 'wip/smcv/uninitialized' into 'cogl-1.22' (*)
  c6d0544... Merge branch 'wip/smcv/test-logs-to-mktemp' into 'cogl-1.22 (*)
  e7df2e3... Merge branch 'wip/smcv/automake' into 'cogl-1.22' (*)
  24da690... Merge branch 'wip/smcv/undefined-left-shift' into 'cogl-1.2 (*)
  b08e3cb... Merge branch 'wip/smcv/tests-skip' into 'cogl-1.22' (*)
  ae96a47... Merge branch 'wip/smcv/tests-verbose' into 'cogl-1.22' (*)
  1ddbbf0... Merge branch 'wip/smcv/test-timeout' into 'cogl-1.22' (*)
  ed0d291... cogl-xlib-renderer: Ensure we don't close the same X displa (*)
  122b390... Merge branch 'wip/smcv/double-close' into 'cogl-1.22' (*)
  9e47213... cogl-winsys-sdl2.c: Fix running on 32-bit Windows
  6622908... cogl/cogl.c: Do not hardcode COGL_LOCALEDIR on Windows
  ef3807f... cogl/cogl-bitmask.h: Use size_t instead of unsigned long
  a3e7470... cogl-crate.c: Fix running on 64-bit Windows
  7a7c1e8... cogl/cogl-debug.h: Export and properly use _cogl_debug_inst

(*) This commit already existed in another branch; no separate mail sent


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]