дата в тулбаре

дата в тулбаре

elNum error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix,
alert error D2<D1,
VLC crashed,

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix
alert error D2<D1
VLC crashed

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

timer error fix

alert error D2<D1

alert error D2<D1

alert error D2<D1

alert error D2<D1

alert error D2<D1 commented

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

VLC crashed

rebase
rebase
rebase
Merge remote-tracking branch 'origin/new_time' into new_time

Conflicts:
	lib/js/flowplayer/aplayerfncs.js
	lib/js/jquery.aplayer.js
	lib/js/vlcControl.js
	offline/gallery/js/main.js
	online/view.js