]> git.parisson.com Git - telecaster-server.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 17 Jul 2013 16:25:36 +0000 (18:25 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 17 Jul 2013 16:25:36 +0000 (18:25 +0200)
commita326f4217f3f89b9e935976759d12445dbaad5df
tree31dd5134aafb4b0a27a7cb6b773b28df0005cea1
parent1a725f66f8d9d76c6f7504a3370a9dc959ad433e
parentab5dae9d514ec3b97fce6d0d88b5f0887e4eddde
Merge branch 'dev'

Conflicts:
tcserver/conf/home/fluxbox/autostart.sh
tcserver/conf/home/fluxbox/autostart.sh