| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-01-03 | Merge remote-tracking branch 'javispedro/js-testing' | Tomasz Sterna | |
| Conflicts: daemon/daemon.pro daemon/dbusconnector.cpp daemon/manager.cpp daemon/watchcommands.cpp daemon/watchcommands.h daemon/watchconnector.cpp daemon/watchconnector.h log4qt-debug.conf log4qt-release.conf rpm/pebble.spec rpm/pebble.yaml | |||
| 2014-11-30 | add stub datalogmanager | Javier | |
