2013-04-20 12:37:36 +02:00
|
|
|
#!/bin/bash
|
|
|
|
|
2013-08-22 06:06:17 +02:00
|
|
|
set -e
|
|
|
|
tup upd
|
2013-09-15 17:44:44 +02:00
|
|
|
<<<<<<< HEAD
|
2013-09-15 16:20:58 +02:00
|
|
|
xterm -e "sleep 1 && aj-snapshot -r .ajsnapshot" & releaseBuild/luppp
|
2013-09-15 17:44:44 +02:00
|
|
|
=======
|
2013-09-14 04:57:58 +02:00
|
|
|
xterm -e "sleep 1 && aj-snapshot -r .ajsnapshot" & ./releaseBuild/luppp
|
2013-09-15 17:44:44 +02:00
|
|
|
>>>>>>> master
|