wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

No bug - fix broken m-c merge.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-07-12 21:17:21 -04:00
parent 166dcf4016
commit 1408fc670a
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/base/Makefile.in
View File

@ -941,11 +941,7 @@ RES_DIRS= \
res/color \
res/menu \
res/menu-v11 \
<<<<<<< local
res/menu-large \
=======
res/menu-large-v11 \
>>>>>>> other
$(NULL)