aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bug/605761'Tatsuya Kinoshita2013-10-153-3/+3
|\
| * Explicitly add -lX11 to IMGX11LDFLAGS only when gtk2Tatsuya Kinoshita2013-10-152-2/+2
| |
| * Revert "Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5"Tatsuya Kinoshita2013-10-151-1/+1
| | | | | | | | This reverts commit 7410954066d68ac2ad6aea638801714447321fec.
* | Merge branch 'bug/schemebug'Tatsuya Kinoshita2013-10-141-10/+21
|\ \
| * | Define schemeNumToName() to fix scheme bugAIDA Shinra2013-10-141-10/+21
| | | | | | | | | | | | | | | Patch from <http://www.j10n.org/files/w3m-cvs-1.1055-schemebug.patch>, [w3m-dev:04470] on 2013-10-14.
* | | Merge branch 'bug/win64gc'Tatsuya Kinoshita2013-10-1413-176/+436
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: istream.c main.c
| * | | Workaround of GC crash on Cygwin64AIDA Shinra2013-10-1413-176/+442
| |/ / | | | | | | | | | | | | Patch from <http://www.j10n.org/files/w3m-cvs-1.1055-win64gc.patch>, [w3m-dev:04469] on 2013-10-14.
* | | Merge branch 'feature/debian-version'Tatsuya Kinoshita2013-10-141-1/+1
|\ \ \
| * | | Update to 0.5.3+debian-12+Tatsuya Kinoshita2013-10-141-1/+1
| | | |
* | | | Merge branch 'bug/cygwin-lang'Tatsuya Kinoshita2013-10-141-3/+3
|\ \ \ \
| * | | | Fix paren in check_cygwin_console()Jarek Czekalski2013-10-141-3/+3
| | | | | | | | | | | | | | | | | | | | Bug: https://sourceforge.net/p/w3m/patches/66/
* | | | | Merge branch 'bug/changelog'Tatsuya Kinoshita2013-10-131-0/+42
|\ \ \ \ \
| * | | | | Update ChangeLogTatsuya Kinoshita2013-10-131-0/+42
|/ / / / /
* | | | | Merge branch 'feature/debian-version'Tatsuya Kinoshita2013-10-131-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update to 0.5.3+debian-12Tatsuya Kinoshita2013-10-131-1/+1
| | | | |
* | | | | Merge branch 'bug/75527'Tatsuya Kinoshita2013-10-134-29/+12
|\ \ \ \ \
| * | | | | Update document for the -s option changeTatsuya Kinoshita2013-10-134-29/+12
| | | | | |
* | | | | | Merge branch 'bug/cygwin-lang'Tatsuya Kinoshita2013-10-131-1/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Do not fail when LANG is not setTatsuya Kinoshita2013-10-131-1/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Check whether the value of LC_ALL, LC_CTYPE or LANG is not NULL in check_cygwin_console(). Bug: https://sourceforge.net/p/w3m/patches/66/
* | | | | Merge branch 'bug/maxcol'Tatsuya Kinoshita2013-10-121-1/+1
|\ \ \ \ \
| * | | | | Bump MAXCOL to 256Tatsuya Kinoshita2013-10-121-1/+1
| |/ / / / | | | | | | | | | | | | | | | Bug: https://sourceforge.net/p/w3m/feature-requests/24/
* | | | | Merge branch 'feature/vim-like'Tatsuya Kinoshita2013-10-122-0/+42
|\ \ \ \ \
| * | | | | vim/-perator like handlingLaurence Richert2013-10-122-0/+42
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | - half page scrolling - jumping to elements numbered by getLinkNumberStr() from Karsten Schoelzel
* | | | | Merge branch 'bug/contact-list'Tatsuya Kinoshita2013-10-122-6/+4
|\ \ \ \ \
| * | | | | Mention project page rather than unavailable mailing listsTatsuya Kinoshita2013-10-122-6/+4
| | | | | |
* | | | | | Merge branch 'bug/readme-img-typo'Tatsuya Kinoshita2013-10-121-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typoRafael Laboissiere2013-10-121-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bug/changelog'Tatsuya Kinoshita2013-08-121-26/+47
|\ \ \ \ \ \
| * | | | | | Update ChangeLog to use contributor's nameTatsuya Kinoshita2013-08-121-26/+47
| | | | | | |
* | | | | | | Merge branch 'feature/debian-version'Tatsuya Kinoshita2013-08-121-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Update to 0.5.3+debian-11+Tatsuya Kinoshita2013-08-121-1/+1
| | | | | | |
* | | | | | | Merge branch 'bug/changelog'Tatsuya Kinoshita2013-08-081-0/+126
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Update ChangeLogTatsuya Kinoshita2013-08-081-0/+126
|/ / / / / / | | | | | | | | | | | | | | | | | | Semi-automatically converted from Git commit logs.
* | | | | | Merge branch 'feature/debian-version'Tatsuya Kinoshita2013-08-081-1/+1
|\| | | | |
| * | | | | Update to 0.5.3+debian-11Tatsuya Kinoshita2013-08-081-1/+1
| | | | | |
* | | | | | Merge branch 'bug/strchop'Tatsuya Kinoshita2013-08-041-2/+2
|\ \ \ \ \ \
| * | | | | | Check length for Strchop()Tatsuya Kinoshita2013-08-041-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bug/execdict'Tatsuya Kinoshita2013-08-041-1/+1
|\ \ \ \ \ \
| * | | | | | Fix potentially segfault of execdict()Tatsuya Kinoshita2013-08-041-1/+1
| |/ / / / /
* | | | | | Merge branch 'feature/siteconf'Tatsuya Kinoshita2013-08-041-2/+3
|\ \ \ \ \ \
| * | | | | | Fix segfault of loadGeneralFile()Tatsuya Kinoshita2013-08-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718612
* | | | | | | Merge branch 'feature/debian-version'Tatsuya Kinoshita2013-08-041-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Update to 0.5.3+debian-10+Tatsuya Kinoshita2013-08-041-1/+1
| | | | | | |
* | | | | | | Merge branch 'feature/debian-version'Tatsuya Kinoshita2013-08-021-1/+1
|\| | | | | |
| * | | | | | Update to 0.5.3+debian-10Tatsuya Kinoshita2013-08-021-1/+1
| | | | | | |
* | | | | | | Merge branch 'bug/w3mman2html-utf8'Tatsuya Kinoshita2013-08-011-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Correct underline processing and more UTF-8 support for w3mman2html.cgiTatsuya Kinoshita2013-08-011-3/+5
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Patch from <https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/680202>, provided by Piotr P. Karwasz.
* | | | | | | Merge branch 'bug/shy'Tatsuya Kinoshita2013-08-011-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Ignore &shy; to prevent drawing hyphens everywhereTatsuya Kinoshita2013-08-011-0/+2
| |/ / / / / /
* | | | | | | Merge branch 'bug/contact-list'Tatsuya Kinoshita2013-08-012-4/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |