Initial commit
	new file:   calc.cpp
	new file:   calc.h
	new file:   calc.pro
	new file:   calc.pro.user
	new file:   main.cpp
	modified:   calc
	modified:   calc.cpp
	modified:   calc.o
	modified:   calc.pro.user
	modified:   calc
	modified:   calc.cpp
	modified:   calc.h
	modified:   calc.o
	modified:   calc.pro.user
	modified:   moc_calc.cpp
	modified:   moc_calc.o
Merge branch 'master' of github.com:elmirador/proto-calc
	deleted:    Makefile
	deleted:    calc
	deleted:    calc.o
	deleted:    calc.pro.user
	deleted:    main.o
	deleted:    moc_calc.cpp
	deleted:    moc_calc.o
	deleted:    ui_calc.h
	modified:   calc.cpp
Merge branch 'master' of github.com:elmirador/calc

Conflicts:
	README.md

	deleted:    README.md