acd4299e75
Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice. |
||
|---|---|---|
| .. | ||
| astyle | ||
| autobuild | ||
| autoconf | ||
| autogen | ||
| automake | ||
| automoc4 | ||
| avrdude | ||
| binutils | ||
| binutils-cross | ||
| cbrowser | ||
| ccache | ||
| cflow | ||
| cgdb | ||
| coccinelle | ||
| complexity | ||
| cpphs | ||
| cppi | ||
| cproto | ||
| cscope | ||
| ctags | ||
| dbench | ||
| ddd | ||
| dejagnu | ||
| distcc | ||
| eggdbus | ||
| elfutils | ||
| epm | ||
| frama-c | ||
| gdb | ||
| gengetopt | ||
| global | ||
| gnum4 | ||
| gob2 | ||
| gperf | ||
| gtkdialog | ||
| help2man | ||
| hydra | ||
| icon-naming-utils | ||
| indent | ||
| inotify-tools | ||
| intltool | ||
| itstool | ||
| jscoverage | ||
| libtool | ||
| lsof | ||
| ltrace | ||
| ninka | ||
| openocd | ||
| patchelf | ||
| pkgconfig | ||
| pmccabe | ||
| premake | ||
| sloccount | ||
| strace | ||
| swig | ||
| sysbench | ||
| texi2html | ||
| texinfo | ||
| uisp | ||
| unifdef | ||
| usb-modeswitch | ||
| xxdiff | ||
| yodl | ||