diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-07-02 16:04:11 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-07-02 16:04:11 -0400 |
commit | f8d7528a5a6ee83536ad397bbad8c46f5984d61f (patch) | |
tree | 2af66ef2f73442300066ec3b3a708740857afa8c /.Xsession | |
parent | 8d5dd1b09ca02e869c89ac87f89bc790bc7c29ee (diff) | |
parent | d383205ac60fdcf39bf2b0f813d63f91cf6e9dd5 (diff) |
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Conflicts:
.emacs
Diffstat (limited to '.Xsession')
-rw-r--r-- | .Xsession | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.Xsession b/.Xsession deleted file mode 100644 index b35cc23..0000000 --- a/.Xsession +++ /dev/null @@ -1 +0,0 @@ -. .profile |