projects
/
dotfiles
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a9334cb
62ea426
)
Autocommit of all changes since last autosync startup on host ares
author
Julien Valroff
<julien@kirya.net>
Tue, 1 Nov 2011 07:50:23 +0000
(08:50 +0100)
committer
Julien Valroff
<julien@kirya.net>
Tue, 1 Nov 2011 07:50:23 +0000
(08:50 +0100)
1
2
autostart
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
autostart
index
212e717
,
c281c96
..
e573e4d
---
1
/
autostart
---
2
/
autostart
+++ b/
autostart
@@@
-9,7
-10,7
+9,11
@@@
xcompmgr -n -f -D5
tint2 &
conky &
clipit &
++<<<<<<< HEAD
+/usr/share/dvcs-autosync/autosync-xdg-launcher.sh &
++=======
+ /usr/share/dvcs-autosync/autosync-xdg-launcher.sh &
++>>>>>>> 62ea42655089d4e7dd69f3f508963c5af17381fb
[ $(pgrep -c offlineimap) = 1 ] || tmux new-session -d -s offlineimap offlineimap &