obadz 3de6e5be50 Merge branch 'master' into staging ... Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix		2016-08-27 23:54:54 +01:00
..
arora
chromium	chromium: fixup share/share	2016-08-27 17:38:25 +02:00
conkeror
dillo
dwb
elinks
firefox	firefox: 48.0.1 -> 48.0.2	2016-08-26 16:46:34 +02:00
firefox-bin	firefox-bin: 48.0.1 -> 48.0.2	2016-08-25 03:12:12 +09:00
google-chrome
jumanji
kwebkitpart
links2
luakit
lynx
midori	midori: vala -> vala_0_23	2016-08-21 20:02:08 +03:00
mozilla-plugins
opera
qutebrowser	qutebrowser: add pdfjs support	2016-08-23 23:36:18 +03:00
rekonq
surf
uzbl
vimb
vimprobable2
vivaldi	vivaldi: 1.2 -> 1.3	2016-08-18 15:13:39 +02:00
w3m