summaryrefslogtreecommitdiff
path: root/.gtkrc-2.0.mine
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-07-16 23:55:23 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-07-16 23:55:23 -0400
commit4dcf99a241f8591b21ce3e8b2dd385cbeb99bbf6 (patch)
treeb275d7a21d46c421d9487dcd1d5043ba8a9bfe5d /.gtkrc-2.0.mine
parent3b8d4575218ab6d8e1155a81c45d81a8631aff25 (diff)
parent3c7c6090cd2e385651f6ef79391c42a65ac06344 (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.mine1
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 @@
+