Viewing all changes in revision 368.
- Committer: Nekhelesh Ramananthan
- Date: 2015-08-26 23:37:06 UTC
- mfrom: (359.1.2 utopic-3.0)
- Revision ID: krnekhelesh@gmail.com-20150826233706-j584upa96v91ec3d
merged trunk
- files added:
- backend/modules/Stopwatch/formattime.cpp
- files removed:
- app/stopwatch/StopwatchUtils.qml
- backend/modules/Stopwatch/LapHistory
- files renamed:
- backend/modules/Stopwatch/LapHistory/backend.cpp => backend/modules/Stopwatch/backend.cpp
- backend/modules/Stopwatch/LapHistory/backend.h => backend/modules/Stopwatch/backend.h
- backend/modules/Stopwatch/LapHistory/history.cpp => backend/modules/Stopwatch/history.cpp
- backend/modules/Stopwatch/LapHistory/history.h => backend/modules/Stopwatch/history.h
- backend/modules/Stopwatch/LapHistory/qmldir => backend/modules/Stopwatch/qmldir
- files modified:
- app/stopwatch/CMakeLists.txt
expand all
collapse all
added
removed
