summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fam-ci' into 'master'1409-drop-glib-zip-inXavier Claessens2018-06-072-9/+10
|\
| * ci: Build fam module on linuxXavier Claessens2018-06-072-1/+2
| * Dockerfile: Reorder packages in alphabetical orderXavier Claessens2018-06-071-8/+8
* | Merge branch 'revert-205059b9' into 'master'Philip Withnall2018-06-074-133/+1
|\ \ | |/ |/|
| * Revert "Merge branch 'wip/oholy/trashing-locations' into 'master'"Philip Withnall2018-06-074-133/+1
|/
* Merge branch 'fam' into 'master'Xavier Claessens2018-06-077-8/+63
|\
| * Meson: Build fam moduleXavier Claessens2018-06-076-6/+62
| * Remove unused HAVE_FAM defineXavier Claessens2018-06-071-2/+1
* | Merge branch 'patch-3' into 'master'Xavier Claessens2018-06-071-1/+1
|\ \
| * | Fix a warning reported by static analyzer toolGaurav2018-06-071-1/+1
|/ /
* | Merge branch 'meson-config-h' into 'master'Xavier Claessens2018-06-073-849/+9
|\ \ | |/ |/|
| * Meson: Remove config.h.meson templateXavier Claessens2018-06-073-849/+9
|/
* Merge branch '1400-g_file_attribute_unix_is_mountpoint-is-false-for-root' int...Philip Withnall2018-06-074-2/+54
|\
| * fileinfo: make UNIX_IS_MOUNTPOINT be TRUE for /Will Thompson2018-06-074-2/+54
* | Merge branch 'array-allocations' into 'master'Christoph Reiter2018-06-071-0/+3
|\ \
| * | garray: Optimise over-allocations with g_array_insert_vals()Philip Withnall2018-06-041-0/+3
| |/
* | Merge branch 'wip/lantw/freebsd-du-problems' into 'master'Philip Withnall2018-06-071-17/+15
|\ \
| * | tests: Don't fail when not using du from GNU coreutilsTing-Wei Lan2018-06-071-17/+15
* | | Merge branch 'master.nomsvcproj' into 'master'Philip Withnall2018-06-0699-13016/+31
|\ \ \ | |/ / |/| |
| * | README.win32: More updates on GLib usageChun-wei Fan2018-06-061-7/+4
| * | build: Remove build/win32/vs8Chun-wei Fan2018-06-0611-2518/+0
| * | build: Remove leftovers of Visual Studio project stuffChun-wei Fan2018-06-066-125/+0
| * | Drop config.h.win32.in and glib/glibconfig.h.win32.inChun-wei Fan2018-06-062-1116/+0
| * | README.win32: Update build instructionsChun-wei Fan2018-06-061-22/+24
| * | build: Drop Visual Studio projectsChun-wei Fan2018-06-0681-9230/+5
|/ /
* | Merge branch 'wip/oholy/gunixmountfor-docs' into 'master'Philip Withnall2018-06-061-0/+1
|\ \
| * | docs: Document g_unix_mount_forOndrej Holy2018-06-061-0/+1
* | | Merge branch 'wip/oholy/trashing-locations' into 'master'Philip Withnall2018-06-064-1/+133
|\ \ \
| * | | glocalfile: Add test case for g_file_trashOndrej Holy2018-06-063-0/+106
| * | | glocalfile: Update G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH logicOndrej Holy2018-06-051-0/+11
| * | | glocalfile: Allow trashing only for locations supported by trash:///Ondrej Holy2018-06-051-1/+16
| |/ /
* | | Updated Czech translationMarek Cernocky2018-06-061-139/+140
* | | Merge branch 'solaris-defines' into 'master'Philip Withnall2018-06-061-1/+7
|\ \ \
| * | | Meson: Add missing defines on SolarisXavier Claessens2018-06-051-1/+7
* | | | Merge branch 'drop-unused-defines' into 'master'Xavier Claessens2018-06-054-14/+1
|\ \ \ \
| * | | | Remove unused HAVE_LONG_LONG_FORMAT and HAVE_INT64_AND_I64Xavier Claessens2018-06-054-14/+1
| |/ / /
* | | | Merge branch 'ci-cleanup' into 'master'Philip Withnall2018-06-051-14/+20
|\ \ \ \
| * | | | ci: Be consistent on artifact namingXavier Claessens2018-06-051-4/+8
| * | | | ci: No need to "cd _build" and set prefix/libdirXavier Claessens2018-06-051-6/+4
| * | | | ci: Add missing "except: tags"Xavier Claessens2018-06-051-4/+8
| |/ / /
* | | | Merge branch 'meson-unused-zlib-libname' into 'master'Christoph Reiter2018-06-051-7/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Meson: Remove unused zlib_libname variableXavier Claessens2018-06-051-7/+2
| |/ /
* | | Merge branch 'patch-2' into 'master'Xavier Claessens2018-06-051-2/+2
|\ \ \ | |/ / |/| |
| * | Fix potential Null pointer dereference.Gaurav2018-06-051-2/+2
|/ /
* | Merge branch '1307-tarball-dist' into 'master'Philip Withnall2018-06-055-934/+0
|\ \
| * | Remove developer script not needed in git repositoryXavier Claessens2018-06-041-6/+0
| * | Remove old tests not being built since 2012Xavier Claessens2018-06-043-814/+0
| * | Remove tests/gio-ls.c that never has been builtXavier Claessens2018-06-041-114/+0
|/ /
* | Merge branch '1401-g_clear_handle_id-clear_func-not-nullable' into 'master'Philip Withnall2018-06-042-4/+2
|\ \ | |/ |/|
| * g_clear_handle_id: don't accept NULL clear_func1401-g_clear_handle_id-clear_func-not-nullableWill Thompson2018-06-042-4/+2
|/