diff options
| author | Dan McGee <dan@archlinux.org> | 2012-01-23 19:19:51 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-01-23 19:20:52 +0100 |
| commit | e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03 (patch) | |
| tree | df2e33d95d02b17e5d720320c19e267893d68bdf /src/pacman/util.h | |
| parent | b3612e9cc198f198b3806efa461bf6fc04dd4502 (diff) | |
| parent | 825b4ff35aa676b139dc24bc651724b092f2fded (diff) | |
| download | pacman-e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03.tar.gz pacman-e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/diskspace.c
src/pacman/util.h
Diffstat (limited to 'src/pacman/util.h')
| -rw-r--r-- | src/pacman/util.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pacman/util.h b/src/pacman/util.h index 5d3ea2f1..18048de9 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -1,7 +1,7 @@ /* * util.h * - * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org> + * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org> * * This program is free software; you can redistribute it and/or modify @@ -52,7 +52,6 @@ int rmrf(const char *path); const char *mbasename(const char *path); char *mdirname(const char *path); void indentprint(const char *str, size_t indent); -char *strtoupper(char *str); size_t strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); alpm_list_t *strsplit(const char *str, const char splitchar); |