summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorJonathan Glines <auntieNeo@gmail.com>2014-06-13 11:41:40 -0600
committerJonathan Glines <auntieNeo@gmail.com>2014-06-13 11:41:40 -0600
commitc977673bb53b632f50f368b4aab69eb3d5a7f9b9 (patch)
tree5359500092580da6fecce55a3974658db2d4c2af /pkgs/top-level
parentc55be95e6e61e9e5111b647c455759776609a34f (diff)
parent8af05e82a024f9427b23f314cd59205126d67bb5 (diff)
downloadnixlib-c977673bb53b632f50f368b4aab69eb3d5a7f9b9.tar
nixlib-c977673bb53b632f50f368b4aab69eb3d5a7f9b9.tar.gz
nixlib-c977673bb53b632f50f368b4aab69eb3d5a7f9b9.tar.bz2
nixlib-c977673bb53b632f50f368b4aab69eb3d5a7f9b9.tar.lz
nixlib-c977673bb53b632f50f368b4aab69eb3d5a7f9b9.tar.xz
nixlib-c977673bb53b632f50f368b4aab69eb3d5a7f9b9.tar.zst
nixlib-c977673bb53b632f50f368b4aab69eb3d5a7f9b9.zip
Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen
Conflicts:
	pkgs/tools/X11/nitrogen/default.nix
Diffstat (limited to 'pkgs/top-level')
0 files changed, 0 insertions, 0 deletions