| commit | 3b5e2c052f5de470da657092db39dab0787e2b85 | |
| author | Ilia Maslakov <il.smind@gmail.com> | |
| Sat, 4 Apr 2009 19:50:46 +0000 (4 19:50 +0000) | ||
| committer | Ilia Maslakov <il.smind@gmail.com> | |
| Sat, 4 Apr 2009 19:50:46 +0000 (4 19:50 +0000) | ||
| tree | 540e6dca62e7188fd75ca8059452817432030ba8 | treesnapshot (tar.gz zip) |
| parent | 19fddfa7874626ded52024fd6616ce0f67d1b4a3 | commitdiff |
| parent | ecd16f78730ed4a36958ae7c66736e3687988c4d | commitdiff |
Merge branch 'utf-8' into master
resolve conflicts:
configure.ac
src/complete.c
src/file.c
src/layout.c
src/main.c
src/menu.c
src/screen.c
src/util.c
src/widget.c
src/widget.h
resolve conflicts:
configure.ac
src/complete.c
src/file.c
src/layout.c
src/main.c
src/menu.c
src/screen.c
src/util.c
src/widget.c
src/widget.h
33 files changed: