diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-22 23:46:29 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-22 23:46:29 -0400 |
commit | d26fda540c355fa37a1381b11765c47fdc5bd006 (patch) | |
tree | f6510335adf691d662cae765cb7f77dcdcbf4efc /.gtkrc-2.0.mine | |
parent | 3b8d4575218ab6d8e1155a81c45d81a8631aff25 (diff) | |
parent | 7036a9b36396ae49cf8ba0f8ad5fe139a65433c1 (diff) |
Merge branch 'hp-dv6426us-par'
Conflicts:
.crontab.local
.git.info.exclude
.wmii/wmiirc_local
Diffstat (limited to '.gtkrc-2.0.mine')
-rw-r--r-- | .gtkrc-2.0.mine | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gtkrc-2.0.mine b/.gtkrc-2.0.mine new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/.gtkrc-2.0.mine @@ -0,0 +1 @@ + |