diff options
| author |  Tom Willemsen | 2012-07-09 19:16:54 +0000 |
|---|---|---|
| committer | Tom Willemsen | 2012-07-09 19:16:54 +0000 |
| commit | 72d124100d3fc4fb7ee9ada43385867b0c171a4d (patch) | |
| tree | 8df784474eb8519032eefcc4e8f92f2dd009ebcc /.config/.gitignore | |
| parent | 8b1b423d0ae8e3b899658b05ae4ecb1c430b618f (diff) | |
| parent | 65dee41a9237a67db713b2bc1bdbcc8a2cec6f67 (diff) | |
| download | dotfiles-72d124100d3fc4fb7ee9ada43385867b0c171a4d.tar.gz dotfiles-72d124100d3fc4fb7ee9ada43385867b0c171a4d.zip | |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.config/fish/config.fish
.xinitrc
Diffstat (limited to '.config/.gitignore')
| -rw-r--r-- | .config/.gitignore | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/.config/.gitignore b/.config/.gitignore deleted file mode 100644 index c65bc94..0000000 --- a/.config/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -*libreoffice/ -Empathy/ -GnuDiary/ -Trolltech.conf -anjuta/ -audacious/ -autostart/ -awesome/ -banshee-1/ -chromium/ -dconf/ -desktop-couch/ -emelfm2/ -enchant/ -fehlstart/ -glade-3.conf -gobby/ -google-chrome/ -gtk-2.0/ -gweled.conf -gwibber/ -leafpad/ -libiphone/ -mc/ -menus/ -nitrogen/ -pDev/ -pytyle/ -rox*.sourceforge.net/ -sakura/ -sonata/ -sound-juicer/ -swfdec-mozilla.conf -tint2/ -totem/ -transmission/ -twmn/ -tyrs/ -user-dirs.* -vlc/ -xm1/ -xmms2/ -zim/ |