 TiReischl
|
ab3325e9c5
solved all merge conflicts
|
%!s(int64=6) %!d(string=hai) anos |
|
TiReischl
|
69a47bba31
solved some mergeconflicts
|
%!s(int64=6) %!d(string=hai) anos |
|
TiReischl
|
fde41312f7
try merge
|
%!s(int64=6) %!d(string=hai) anos |
|
TiReischl
|
99b4732b25
Merge branch 'userstory4' of https://github.com/m-edlund/BP-SketchAssistant into userstory4
|
%!s(int64=6) %!d(string=hai) anos |
|
TiReischl
|
4a6d997d80
added draw function
|
%!s(int64=6) %!d(string=hai) anos |
|
TiReischl
|
1981305e82
"clean branch"
|
%!s(int64=6) %!d(string=hai) anos |
|
Martin Edlund
|
10863d7887
Made branch ready for pull request
|
%!s(int64=6) %!d(string=hai) anos |
|
m-edlund
|
d32323ddb0
Updated Travis.yml
|
%!s(int64=6) %!d(string=hai) anos |
|
m-edlund
|
4b25158f37
Created .travis.yml
|
%!s(int64=6) %!d(string=hai) anos |
|
TiReischl
|
f97051e166
Merge pull request #2 from m-edlund/userstory3
|
%!s(int64=6) %!d(string=hai) anos |
|
m-edlund
|
1cb54bebf2
Deleted pointless file
|
%!s(int64=6) %!d(string=hai) anos |
|
Martin Edlund
|
c06e4e5f48
Changes to userstory.md
|
%!s(int64=6) %!d(string=hai) anos |
|
Martin Edlund
|
0d01d4fe1a
Finished Userstory 3, removed some bugs
|
%!s(int64=6) %!d(string=hai) anos |
|
TiReischl
|
04ccbc51b0
added draw function
|
%!s(int64=6) %!d(string=hai) anos |
|
TiReischl
|
d01583bbb5
"clean branch"
|
%!s(int64=6) %!d(string=hai) anos |
|
TiReischl
|
5b697e073e
Merge branch 'userstory4' of https://github.com/m-edlund/BP-SketchAssistant into userstory4
|
%!s(int64=6) %!d(string=hai) anos |
|
Martin Edlund
|
11687e28bd
Added functionality to create a canvas. Bugs remain
|
%!s(int64=6) %!d(string=hai) anos |
|
TiReischl
|
4f05ddbe8b
Merge pull request #1 from m-edlund/userstory1
|
%!s(int64=6) %!d(string=hai) anos |
|
m-edlund
|
f07a91f13a
Updated Travis.yml
|
%!s(int64=6) %!d(string=hai) anos |
|
Martin Edlund
|
a621346c6f
Made branch ready for pull request
|
%!s(int64=6) %!d(string=hai) anos |
|
m-edlund
|
d73034d04a
Created .travis.yml
|
%!s(int64=6) %!d(string=hai) anos |
|
TiReischl
|
e1632c892a
einfache Zeichenfunktion mit Timer
|
%!s(int64=6) %!d(string=hai) anos |
|
Martin Edlund
|
2874851028
Started Userstory 2, filedialogue in place,
|
%!s(int64=6) %!d(string=hai) anos |
|
Martin Edlund
|
f9fe230681
Created simple window with toolbar and a division of the window into two
|
%!s(int64=6) %!d(string=hai) anos |
|
Martin Edlund
|
1d49f39dc5
Changed userstories & added content to QS-Document
|
%!s(int64=6) %!d(string=hai) anos |
|
Martin Edlund
|
fd712d518a
added userstory1 to branch userstory 1
|
%!s(int64=6) %!d(string=hai) anos |
|
Martin Edlund
|
a6680140fc
Created new Project. Removed some UI Elements.
|
%!s(int64=6) %!d(string=hai) anos |
|
m-edlund
|
a431f9d133
Initial commit
|
%!s(int64=6) %!d(string=hai) anos |
