added slider
added tab control
added ta
added ta
zj
Merge branch 'develop' of https://github.com/kkralj1/test-repo2 into develop
Update MainWindow.xaml
Merge branch 'develop' of https://github.com/kkralj1/test-repo2 into develop
Update MainWindow.xaml
Merge branch 'develop' of https://github.com/kkralj1/test-repo2 into develop
Update MainWindow.xaml
added window2
Merge branch 'develop' of https://github.com/kkralj1/test-repo2 into develop

Conflicts:
	WpfApplication1/MainWindow.xaml
no message
l
Added login form