leap-client.git, branch upstream [leap-client] Merge branch 'develop' into upstream 2012-08-09T15:45:07+00:00 kali kali@leap.se 2012-08-09T15:45:07+00:00 d6e46003c8164c0030b67efaccc2b25643f5d20b Conflicts: .gitattributes 
Conflicts:
	.gitattributes
add .gitattributes 2012-08-09T15:44:15+00:00 kali kali@leap.se 2012-08-09T15:37:03+00:00 0ed6e5db8a7109bd558ade054284362bb21d8944 






add .gitattributes
2012-08-09T15:37:03+00:00

kali
kali@leap.se

2012-08-09T15:37:03+00:00

b06e938d688c89bfb4529ff593672e726403e152












fix install virtualenv script
2012-08-09T14:37:21+00:00

kali
kali@leap.se

2012-08-09T14:36:41+00:00

d2250c4ed065ffedf85f388ef03f58c167d8099a












updated resource
2012-08-09T14:14:01+00:00

kali
kali@leap.se

2012-08-09T14:08:19+00:00

e0f7a63cb36151909176d919282a00fc5a708455












added packaging feature to Makefile
2012-08-09T14:05:32+00:00

kali
kali@leap.se

2012-08-09T13:04:43+00:00

247a0aff2f75b012feede58cda3049d68f783208












remove debian/ from integration branch (moved to its own branch)
2012-08-09T13:58:25+00:00

kali
kali@leap.se

2012-08-09T13:58:25+00:00

63e7e66dc2e820186180f96e71fd0a0541b0bbcf












remove qt tests from main run (break deb pkg build)
2012-08-08T17:18:16+00:00

kali
kali@leap.se

2012-08-08T17:08:39+00:00

28b6730601521cffa72c15e6d244f017f7c5b64a












re-added missing mainwindow_rc
2012-08-08T16:45:45+00:00

kali
kali@leap.se

2012-08-08T16:45:45+00:00

bcefbb5fa47ef248c04488bb7b40b69abcf3b4af












updated README
2012-08-08T11:12:34+00:00

k clair
kclair@riseup.net

2012-08-07T18:19:32+00:00

bda0f214d13387e4efceb127f0a8bbb37935f98c

cherry-picked kclair updates on buildbot branch into develop branch.





cherry-picked kclair updates on buildbot branch into develop branch.