team4alfanous team mailing list archive

Thread
Date

[Branch ~team4alfanous/alfanous/alfanous-git] Rev 425: Merge branch 'classic_output'

To: Alfanous team <team4alfanous@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 28 Nov 2012 17:03:13 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Assem <assem@assem-ThinkPad-X201-Tablet.(none)>
  Assem Chelli (عاصم شلي) (assem-ch)
------------------------------------------------------------
revno: 425 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Sat 2012-11-17 13:47:06 +0100
message:
  Merge branch 'classic_output'
  
  Conflicts:
  	interfaces/web/wui/css/screen.css
  	interfaces/web/wui/index.html
added:
  interfaces/web/wui/css/keyboard.css
  interfaces/web/wui/images/keyboard.png
  interfaces/web/wui/js/keyboard.js
modified:
  interfaces/web/wui/css/screen.css
  interfaces/web/wui/index.html
The size of the diff (2158 lines) is larger than your specified limit of 500 lines

--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git

Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription