merging changes

Browse source

...

This commit is contained in:

rolux 2010-09-03 10:47:40 +02:00

parent e2f6492638

commit 9842418f0d

111 changed files with 5275 additions and 930 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

build/png/ox.ui.classic/buttonPlay.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/buttonCollapse.png → build/png/ox.ui.classic/symbolAbove.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolAdd.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolBelow.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolCheck.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

0

build/png/ox.ui.classic/buttonClear.png → build/png/ox.ui.classic/symbolClear.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

BIN

build/png/ox.ui.classic/symbolClose.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

build/png/ox.ui.classic/symbolCollapse.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolDate.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolEdit.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

build/png/ox.ui.classic/buttonExpand.png → build/png/ox.ui.classic/symbolExpand.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolFind.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

build/png/ox.ui.classic/symbolHelp.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolInfo.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolLocation.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

build/png/ox.ui.classic/buttonCollapse.png → build/png/ox.ui.classic/symbolLock.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolMute.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

0

build/png/ox.ui.classic/buttonNext.png → build/png/ox.ui.classic/symbolNext.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/buttonRemove.png → build/png/ox.ui.classic/symbolNone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/buttonAdd.png → build/png/ox.ui.classic/symbolPause.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolPlay.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

0

build/png/ox.ui.classic/buttonPrevious.png → build/png/ox.ui.classic/symbolPrevious.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/buttonPause.png → build/png/ox.ui.classic/symbolRemove.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

0

build/png/ox.ui.classic/buttonSelect.png → build/png/ox.ui.classic/symbolSelect.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolSpin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolTime.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

build/png/ox.ui.classic/symbolUnlock.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolUnmute.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.classic/symbolUser.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

build/png/ox.ui.classic/buttonClose.png → build/png/ox.ui.classic/symbolVolume.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

BIN

build/png/ox.ui.classic/symbolWarning.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/buttonExpand.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/buttonFind.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/buttonNext.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/buttonPlay.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/buttonPrevious.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/icon.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 476 B

BIN

build/png/ox.ui.modern/symbolAbove.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

0

build/png/ox.ui.modern/buttonAdd.png → build/png/ox.ui.modern/symbolAdd.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolBelow.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolCheck.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

0

build/png/ox.ui.modern/buttonClose.png → build/png/ox.ui.modern/symbolClear.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolClose.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolCollapse.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolDate.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolEdit.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

build/png/ox.ui.modern/symbolExpand.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolFind.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

build/png/ox.ui.modern/symbolGoToIn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolGoToOut.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolHelp.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolInfo.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolLocation.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolLock.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolMute.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolNext.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolNone.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

0

build/png/ox.ui.modern/buttonPause.png → build/png/ox.ui.modern/symbolPause.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolPlay.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolPlayInToOut.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolPrevious.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

0

build/png/ox.ui.modern/buttonRemove.png → build/png/ox.ui.modern/symbolRemove.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

0

build/png/ox.ui.modern/buttonSelect.png → build/png/ox.ui.modern/symbolSelect.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolSetIn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolSetOut.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolTime.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

build/png/ox.ui.modern/symbolUnlock.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolUnmute.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolUser.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolVolume.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui.modern/symbolWarning.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui/videoMarkerCut.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

build/png/ox.ui/videoMarkerIn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui/videoMarkerInBottom.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui/videoMarkerInTop.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui/videoMarkerOut.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui/videoMarkerOutBottom.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui/videoMarkerOutTop.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

build/png/ox.ui/videoMarkerPlay.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB