labofsahil/github-event-dataset-2012 huggingface dataset:
last commit - the deployment to the www.eng.tau.ac.il works

the deployment is not easy:
ssh tunnel to www.eng.tau.ac.il port 1024 through gate.tau.ac.il
alexlib port 22

then sftp to a localhost with port 1024
Fixed configuration loading problem when running the jar
Cleanup somethings
get-mac-addr command
adding site 1st talke
Updated Ukrainian translation.

Change-Id: Iaf64a900f54aff05974a734e7c473fa7da277bcc
Get rid of the un-Holo background drawable in the running app detail view

Change-Id: Ib66178381c8a11cc141485bf3f8bcc61ef131f48
Signed-off-by: Eddie Ringle <eddie.ringle@gmail.com>
updated pt-PT (european Portuguese) translation. fixed blanks and minor language fix

	modified:   res/values-pt-rPT/arrays.xml

Change-Id: I524dc129bda0f358d4ee44037386cd07aa8770b1
Settings: improve Spanish translation

PATCH2: removed all white spaces

Change-Id: I5727efd1831faf083219a9f8f3d2b3343ba6e021
Settings: Fix font size mismatch in RingerVolumePreference

This commit fixes the font size mismatch between the 'Link mute
states' and 'Link volumes' checkboxes in the RingerVolumeDialog

Change-Id: I019a49e406c87c3b34c9f0535cd2b00f3836255d
Settings: Fix font size in Profiles dialogs to match design

This commit changes the font size of the message text in the Profiles
related dialogs to TextAppearanceSmall to match the other dialog boxes
in AOSP Settings.

This also cleans up some redundant click listeners in the same dialogs

Change-Id: I2e4e1041e1b707a27a782eba86f8afc015c17527
Merge "Get rid of the un-Holo background drawable in the running app detail view" into ics
Electron Beam Animation (2/2 Settings)

Change-Id: I40a73daf78379d00533ceb701a5cab530cb1b053
Japanese : update translation, Add new translated string entries.

  Patch-2: add arrays.xml

Change-Id: Ib2b7d4e0ca8380c223b7bb9fc14713d4598f1cc4
Merge "Updated Ukrainian translation." into ics
Merge "updated pt-PT (european Portuguese) translation. fixed blanks and minor language fix" into ics
Ad-hoc network support (settings part)

Based on GB patch by havlenapetr

Change-Id: Icb59e817d346dfc0e93a254ffafa9761fa47ec0c
Merge "Settings: improve Spanish translation" into ics
Settings: Slide lock delay settings (Part 2 of 2)

This commit modifies the already merged slide lock delay settings to
be more respectful of AOSP security settings.  The CM settings will
only be used when a secure lock screen (user has a pin/pattern/password)
is not enabled (slide lock screen type)

This also fixes when the QuickUnlock and MenuUnlock options are enabled
- QuickUnlock = only if secure or slide screen
- MenuUnlock = only if secure or slide screen and if button exists

Patch set 2 - fix whitespace

Change-Id: Ic928638e1f0b31c50d1c6cff44babbab048fc2db
Merge "Settings: Fix font size in Profiles dialogs to match design" into ics
Merge "Settings: Fix font size mismatch in RingerVolumePreference" into ics
Merge branch 'ics' of git://github.com/CyanogenMod/android_packages_apps_Settings into opensensation
Don't test template content with change markers

Template content can't be changed. So why try to talk about it as if it has?
Tests no longer use change markers where an about attribute matching ^#mwt is
on the node.

Change-Id: I3bfbe1689089ede51ce5efd1360009a5cacd9675
ARMS Customization Module - first code commit
AMRS Customization Module - modified settings to ignore target folders and eclipse-generated files
AMRS Customization - added custom index page and stylesheet
AMRS Customization Module - added HL7 queue status monitor page
AMRS Customization Module - added userbar css fix from TRUNK-2430 until AMPATH gets 1.8.3
AMRS Customization Module - added ribbon and logo images, modified custom index page to point at module images
AMRS Customization Module - added control of maxUploadSize setting
AMRS Customization Module - added several sites to the MRN Generator page
AMRS Customization Module - fixed NullPointerException when no roles are passed to getUsers()
AMRS Customization Module - added prioritized HL7 processing for ANC forms
AMRS Customization Module - added Kapenguria to MRN generator
AMRS Customization Module - added Concept Form code to allow adding drugs to concept questions in 1.8.3
Simple add for two sites Group B
AMRS Customization Module - added drug form changes for TRUNK-3129
AMRS Customization Module - added box at top of patient dashboard form entry tab for recently entered forms by that user
AMRS Customization Module - fixed overriding drug controller definition per TRUNK-3248
updated OMOD POM to reflect current version
added concept proposal mapping override for setting obs.uuid during mapping
Changes added to cater for already existing latitudes and longitudes into decimal format
Changes added to cater for already existing latitudes and longitudes into decimal format
Some adjustments on permission settings in zip_template
Adjust some potential script bugs/sysctl bugs:
- Fix typo in sysctl.conf (dirty_expire_centisecs)
- Don't rely in sysctl binary as a lot of ROMs don't have it
- Run set_zen_sysctl in the background
Added coffee-script support.

* Added query for coffee-mode's indent level.
Add support for msm7x27

Change-Id: Id73f7b4e227debfada242041805061731bfa8088
Update notes for submitted changes

* Increased nominal voltage for MPU1350MHz
net: wireless: bcmdhd: Set MMC_PM_KEEP_POWER flag on suspend

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
(cherry picked from commit b7f01a5788d4c188b25b05fc5756f97acbfec673)
net: wireless: bcmdhd: Turn OFF wlan power if interface UP fails

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
(cherry picked from commit 216527eb2363d03afde1263a9aaab79999e9140a)
Merge "net: wireless: bcmdhd: Set MMC_PM_KEEP_POWER flag on suspend" into ics
Merge "net: wireless: bcmdhd: Turn OFF wlan power if interface UP fails" into ics
Phone: Add transparency to incall screen

Change-Id: Ie366d3bcdb38c497e89848f8534f7f1af317a9fa
Merge "Phone: Add transparency to incall screen" into jellybean
fix build ALOG -> LOG
And a few more changes, more minor this time.
Github Fix #2 - DEBUG-switch is no longer needed in GUI
Remove unuseful files

Change-Id: I0bddc7a59d70e47967ddd1c932d24279e4d22b76
PT-BR: Added missing translations

Change-Id: If52670b7ff9b4307bee670cdce14838ac62310f6
Merge "PT-BR: Added missing translations" into jellybean
Mms auto-retrieval (1/2): framework

- Settings: Add auto-retrieval and auto-retrieval-on-roaming strings
- GsmDataConnectionTracker: Gets settings and auto-connects APN_TYPE_MMS

Patch set 2   : Fix NPE when the preference was not yet set to a defaulted
                value
              : Add @hide's
              : Set proper defaults

Change-Id: I9c4ea47cd39cd017fba3d5b0649d0e84aaf78b4e
Framework: Fix Profiles Insecure lock screen not working

This fixes Issue 6226: The insecure lockscreen setting is not being activated with
the use of profiles if the default is secure (PIN or Password)

Change-Id: I2fdb8b8eedd136abfeeb30d2f7397d4eec871cc9
Merge remote-tracking branch 'cm/jellybean' into jellybean
Add comment about setTimeout
Add description and usage
Make CM Tree AOSP Compatible
Fix Notification contact picture size - MarcLandis
#_18: TspBerechnungsdaten und Tests. Strukturen für Abstände und
Pheromonen definiert, Methoden für Initialisierung, Abfrage(Getter) und
Entfernungsberechnung.
Merge branch 'master' of https://github.com/Thomas-Schmidt/fachuebergreifendesLabor.git
Pull recorder code up into the gem.
Improved Backend Field Labels.
updating bio info on index
Removing old requirement.
Removing erroneous Datamapper setup
Setting up server start/stop in capistrano
tweaking deployment configs
fixing spelling error
fixing rack not rake
Changing ENV and pid names in the unicorn conf file
More minor bugfixing
Maybe fixing a problem where the the old unicorn processes aren't being killed
Clearing up the deployment files.
revert RAM-disk building
Updated bottom of post layout
Comment out prose section in config
hid metadata for grid in placement
Updated documentation.
Updated documentation.
Updated documentation
Updated documentation.
Updated routes and rspec tests
Remove permalink for now
Added information on how to use the toplevel
smdk4210: fix setPreferedNetworkType when mobile data is connected

Change-Id: I42997c13a8582a401d4d80cfe98227a1ecb446eb
Fix restoring network mode preference on reboot.

When a user sets the option to use only 2G networks (for GSM networks) or its
equivalent for CDMA networks, each reboot erases that setting. That forces
the user to re-select the same option after each boot.
This (very simple) patch fixes it.

Change-Id: Ib9e4bba6da705c127ce1f3aa3c242b9262541cee
Progress on the second part of the assignment about recursion. The first part is complete
modify rvm install command
Counting the minutes until Jordan yells at me for inline styling this
Started experimenting with multi-threading in processing analysis.
Fix for Passcode not Showing up on Orientation Change
Merge pull request #132 from forcedotcom/bugfix

Fix for Passcode not Showing up on Orientation Change
fix path of gateway remote test in generator
Fixes: #1552 zone file and named filed are in the same folder
Automated Snapshot Generated at Mon May  7 05:21:27 2012.

Snapshot at Commit on <perl-experimental>:

	3482499 by Kent Fredric on Mon May 7 17:18:17 2012 +1200
	"Sync metadata/perl"

PORTDIR SYNC CONTEXT:

/metadata/timestamp 	: Sun May  6 14:36:59 UTC 2012
/metadata/timestamp.chk : Sun, 06 May 2012 15:00:01 +0000
/metadata/timestamp.x	: 1336314901 Sun May  6 14:35:01 2012 UTC
readme を追加
Merge pull request #1 from getbusyliving-or-getbusydieing/pub-add-readme

readme を追加
init gemspec
Merge pull request #2 from getbusyliving-or-getbusydieing/pub-init-gemspec

init gemspec
restruct クラスの追加
Merge pull request #3 from getbusyliving-or-getbusydieing/pub-add-restruct

restruct クラスの追加
version 1.0.0
gem サーバー設定追加
up version
mass-assignment 用 role を渡せるように修正
Merge pull request #4 from getbusyliving-or-getbusydieing/fix-mass-asignment-role

mass-assignment 用 role を渡せるように修正
enable multi .config flipping for all kernel types (EX,OC,STD for normal and LTE)
add support for bearer token in auth header
update cookie auth for changes to graph/www
Merge branch 'header-auth'
use header instead of cookie for -p
update changelog
Make the volume overlay more functional 2/2

This patch is to add the settings in the Sound Menu.
And also to persist the users choice.

It depends on the patch: http://review.cyanogenmod.com/#change,14375

Under Volumes is a new List Preference for the volume overlay Style

Options are
   * Single
   * Expandable
   * Expanded
   * None

Devices with phones get Single
Other device get Expandable

Changing this fires an intent that the Volume Panel is listening for.

Change-Id: I680124f534d667a0331cf0f0e3a5ec7eafb2068e

Conflicts:

	src/com/android/settings/SoundSettings.java
Data2SD initial code, and SD card fix for recovery
began consolidating multiple timers into a single class
Pom changes.
Merge pull request #5 from stefanbrausch/master

Pom change.
- Suppressed invalid restricted-access warnings
- Fixed a bug in creating package folders
Added timestamp-updating code to the builder for existing files (h/t
NTF)
v1.0.8a2: Fix for issues found on testing round 2
[x] Locale strings should not include %, they were replaced with <>
Signed-off-by: jfederico <jesus@123it.ca>
Merge branch 'master' of github.com:blindsidenetworks/moodle-mod_bigbluebuttonbn_19
link for pmichael
revert to previosu style, to see if it works in teh Factory
* add exam
added Chrome Extension
TianYang: remove an annotation

git-svn-id: https://source.kii.com/servo/platform/sdk-mobile-client/androidV1/Samples/KiiFileStorageSampleApp@22479 e7cb0379-d053-0e4b-a1ac-43c7dbffadbe
TianYang: remove an annotation

git-svn-id: https://source.kii.com/servo/platform/sdk-mobile-client/androidV1/Samples/KiiFileStorageSampleApp@22480 e7cb0379-d053-0e4b-a1ac-43c7dbffadbe
Update: win32 project
Crone job time set
Add light values from Whyzor.  Also adjusted vibrator pattern from cm7.
Update config.xml
Copy libmmjpeg.so to /obj/lib/ also
Update kernel to 2.6.32.39
Fix RIL that was broken in the last merge
added PNG images of the schematic, layout, and 3d rendering
changed update alert message
MOD: Renamed 'ensureString' method to 'toString'.
Added tag rabbitmq_v3_0_1 for changeset 2bf0f475ca4e
Revert "Trimmed the branch to only the image_transport_plugins sub directory"

This reverts commit 3d6bb800fb1983d149affbe012798331fa9a6598.
Revert "Revert "Trimmed the branch to only the image_transport_plugins sub directory""

This reverts commit cc630a76ab19679ca7d21c1bd7f104cebd43b29e.
Rebase from 'upstream' @ version '1.8.5'
Trimmed the branch to only the image_transport_plugins sub directory
Fixed UIFR-91 so that SimpleObject.fromObject doesn't format nulls, booleans and integers as strings
USB OTG - SebastianFM
USB: OTG: Take wakelock when VBUS present

Enabled by default, can disable with:
   echo N > /sys/module/otg_wakelock/parameters/enabled

Change-Id: I34974624c52ae23490852b44c270d2f326cf6116
Signed-off-by: Todd Poynor <toddpoynor@google.com>
[PATCH] usb: otg: Temporarily grab wakelock on charger and
 disconnect events

Change-Id: If995d4af4adcb08e8369009483f2956ad9627267
Signed-off-by: Todd Poynor <toddpoynor@google.com>
drivers/usb/misc: add ehset.c for OTG operations
add more stat.
patientID now created in same manner as encounterID.
Saves properly to Patients and Encounters tables.
updating All Users Display page for consistency with other pages
Send updates on every tick
the jb way
Merge pull request #3 from Ll0ir/patch-3

the jb way
did MC for Case 1
Removes strange 'Match #1' text from Command-T
Changes all secondary windows to violet
No long need to power cycle (Thanks Rickta59)
reverted back to regular ASP.NET layout

in order to maintain Nuget compatibility
cpufreq_pegasusq.c - Adjust parameters
Revised for PSR-2 compliance.  Re-enabled codesniffer in travis builds.
Merge branch 'master' of https://github.com/triplepoint/groundhog-template-renderer.git
Localisation updates from http://translatewiki.net.

Change-Id: I78d63eef5afffa5256bdd988cb1328cf9c476dfc
(no bug) fixed SiteLinkLookupTest

- according to changes done in I16639c78

Change-Id: I8594bbf91d2228f0dd2f049da66b7b954bf7940e
Moving event documentation from entityViewInit to wikibase

Restrict/block events are triggered on the wikibase object and should to be documented there.

Change-Id: Ic9de25b4f457ea5994e30f5a734a0598fffa0271
Merge "Moving event documentation from entityViewInit to wikibase"
Added classes 'wb-edit' to claim widget and claim section when editing

Change-Id: I0ca0a52d6c09a51edc5d3ed1063dafa48b6cd9f6
Merge "Added classes 'wb-edit' to claim widget and claim section when editing"
(bug 43074) Move focus to value view after selecting property

Depends on change I647921c2.

Change-Id: I225e005eb52607d235eec387da17eb27845b98cf
Merge "(bug 43074) Move focus to value view after selecting property"
Minor UI changes to show.html
PowerWidgetUtil: Remove flashlight as a default button

Remove BUTTON_FLASHLIGHT as a default button in
PowerWidgetUtil::getCurrentButtons so as to remain in sync with the
defaults used by PowerWidget (SystemUI).

Otherwise the power widget will only contain four buttons on first boot
(five including WiMAX), but the flashlight will "mysteriously appear" if
any other button is toggled in the "Widget buttons" settings.
App manager: Enable fast thumb scrolling

Change-Id: I018344b5f62b306e96841d6c36c84534956466d1
Settings: Dutch translations

Change-Id: I947c955d3fb04f72b45a4e2b342a09893092fced
Merge "App manager: Enable fast thumb scrolling" into jellybean
Allow airplane and silent power toggle (1/2)

Based upon the system already in place by DvTonder

Change-Id: I8d23ee78bc5d455d10b6cd0a221f12a13f3f64dc
Merge "PowerWidgetUtil: Remove flashlight as a default button" into jellybean
Call to equals() comparing different types

FindBugs description:

Call to String.equals(DataUsageSummary$AppItem)
at DataUsageSummary.java [line 1173]
in method updateDetailData()

This method calls equals(Object) on two references of
different class types with no common subclasses.
Therefore, the objects being compared are unlikely to
be members of the same class at runtime (unless some
application classes were not analyzed, or dynamic
class loading can occur at runtime).
According to the contract of equals(), objects of different
classes should always compare as unequal;
therefore, according to the contract defined
by java.lang.Object.equals(Object), the result of
this comparison will always be false at runtime.

Bug kind and pattern: EC - EC_UNRELATED_TYPES

Change-Id: I8d3d9239b2f296a89968e20381f82e499f43f5d6
Merge "Call to equals() comparing different types" into jellybean
Voodoo Sound v10

Taken from nekos/crespo-kernel
Changing client code for Windows compatibility
Adding command line input to sockets.pl
Update for April and add Thom's email.
Tamir added another png
Merge branch 'master' of github.com:CloudifySource/cloudifysource.github.com
Added test QSG
Use Season Fanart
Bugfix TVShow backgrounds
Merge pull request #49 from Mudislander/master

Use Season Fanart
Revert "Add PVR info to Sys Info"

This reverts commit 5189421f28d865e5932055c8ceb687611c9a4032.
Update storage for jellybean

Change-Id: I3527a1a08228fa56ad7c0dc0dbaf698601cd9e4a
Merge "Update storage for jellybean" into jellybean
d2spr: Update mms_overlay

	- Set correct uaProfUrl for Sprint Samsung devices
	- Set correct userAgent for Sprint Samsung Galaxy S III

Change-Id: Idf90dcd6b09c27dd6fbe85e92f57871edb287747
Camera hungarian translations

Change-Id: Iffb5d9a5c6380ee5e8b9f36346f41c3d674109fd
Update notes for submitted changes

* Update polish translation
Update notes for submitted changes

* Hungarian translation for Burst mode
somehow missed this when switching to repo
Added new logo and CGRS Beers info
Added perl & general info on it
Added stdlib section and a bit of info on system streams
Changed library around to be more public friendly.
Handling file copy.
Reorganized files
Added pubnub/spriter example
Ok finally fixed and added Do Not Disturd.
Revert "libstagefright : Fix for clips with Corrupt NAL length"

This reverts commit 3cadcdf736737b4fda0d29db46633ac1df7613f3.
Site updated at 2012-09-03 21:25:04 UTC
1.02: Some little improvements
1.02: Little fixes
Improved code documentation (clarified when the request is dispatched).
AJOUTE de APP BROADCAST et PASSAGE AU ROUTING
Updated (7/11/12)
site manager and page manager tables are obsolete now
Appended '/'
Added template.xaml to hold UI styles

Added template.xaml to hold UI styles
ROMControl: Updated danish translation

Change-Id: I973e4d1e45bc4faeecb4aa5ad2574f0baebccf63
Add customizable options for Circles Lockscreen

Background color: default = #d2000000
Ring color: default = #ffffffff
Halo color: default = #ffffffff
Wave color: default = #d2ffffff

Change-Id: I65383e48c6d4cc777a69918ff9349c617055109e
Lefty Mode (2/2)

Adds ROMControl option for upcoming LeftyMode

PS2 Make changes needed for the frameworks fiasco

PS3 switched.. to switch case.

PS4 Took out SysUI reboot for NavRing changes - not needed
    Added reboot for Lefty Mode change

PS5 Whitespace cleanup.

Change-Id: I753506b5c6fe8f9625f19ea76ecb6177bf5b53cf
ROMControl Widget Fixes

I renamed a few variables here for readability,
but also tracked down an odd error on the NavBar Widgets.
Turns out multiple Broadcast Receivers could be instantiated
via Starting/exiting/starting ROMControl Widget editing.
These multiple receivers would behave erratically when getting
'New Widget' intents multiple times.  Mostly it would try to
deallocate the previous ID, resulting in the 'could not inflate
widget' error.
This causes RC to unregister the receiver when not in use, so
only 1 receiver will be active at any one time.

Change-Id: I50a1d89c46df2903201281ac1d2dc0d862e42119
Signed-off-by: Zaphod <mwilson@acesappraisal.com>
ROMControl: Updated czech translation

Patch-set 2: More translation

Patch-set 3: Circle lockscreen and lefty mode

Change-Id: I977ea86e82f905776a2b1adad5774a53b9c739f1
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
NavRing: Long press actions. 2/3

Options for long press and needed additions for lockscreen targets glowpad

rebase and add checkbox for longpress options

clean up and more

Change-Id: I183e56ea7ee95e06199b3bafee9b0a7e06e9f087
Merge "ROMControl: Updated czech translation" into jb
Merge "ROMControl: Updated danish translation" into jb
Updated danish translation

Change-Id: I16dd196c0fe54ce30e83821df4dda45e6a88fa4f
Updated danish translation

Change-Id: Idb4a259f74142f44a6c03946977482ff8e623053
ROMControl: Ability to set navbar width/height to 0 (off)

Change-Id: I2914b8ecd5e2307b35514077f5c9c67c8013c0f7
RC: Lockscreen Targets: Change how we instantiate the
unlock widget since the same id might have different
instances. GlowPadView/CirclesView.

Change-Id: I20453323019e79c22c8c3e68cd0c86a881e0e439
Remove duplicated onTargetChange from last commit to fix build.

 Patch Set 2: #blamebabyjesus

Change-Id: Ia11d1db88852be6f7a76843e7b0d70a87102130e
Add alpha settings to Circles lockscreen rings

Change-Id: I463a36a431c619ed13f3728ab6e0be2cf3a85db8
Merge "Add alpha settings to Circles lockscreen rings" into jb
Merge branch 'jb' of https://github.com/AOKP/packages_apps_ROMControl into aokp
Add OMX codecs
random pairs object from PINA list
Link to external libintl if necessary.
adplug: Missing #include.
FINALLYgit add .
fix gid.
Back to non embedded
冲突后,还原的版本.
Adds additional diner's club intl prefix

Several resources list "38520000023237" as a valid Diner's Club test number.
So the plugin should support it, unless the prefix is defunct and is still
being listed.

See e.g. https://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm
adding updated prebuilt lines to mk to fix audio (thanks preludedrew/jcsullins)
sdk link
Bump generator version so we get units in datadefs
+ ‘twitter_facebook.psd_.zip’
libaudiopolicy.so - I think I got them all?
Added a better description to the README file
Update CS2112GroupProject/src/critter/WorldImpl.java

Fixed minor bug.
Bump to engineyard-serverside version 1.6.1
Map fix and unitclasses sql
White Space non-changes
Added more offer implmentation.
added Music Sheet
Facebook login now persisting to login table.
new file:   src/main/java/es/upm/fi/dia/oeg/map4rdf/client/action/GetGeoResourcesFromRdfFile.java
	new file:   src/main/java/es/upm/fi/dia/oeg/map4rdf/client/action/GetGeoResourcesFromRdfFileBase.java
	new file:   src/main/java/es/upm/fi/dia/oeg/map4rdf/client/event/ShapeFilesChangedEvent.java
	new file:   src/main/java/es/upm/fi/dia/oeg/map4rdf/client/event/ShapeFilesChangedHandler.java
	new file:   src/main/java/es/upm/fi/dia/oeg/map4rdf/client/presenter/ShapeFilesPresenter.java
	new file:   src/main/java/es/upm/fi/dia/oeg/map4rdf/client/view/ShapeFilesView.java
	new file:   src/main/java/es/upm/fi/dia/oeg/map4rdf/server/command/GetGeoResourcesFromRdfFileHandler.java
	new file:   src/main/java/es/upm/fi/dia/oeg/map4rdf/server/servlet/FileUploadServlet.java
	new file:   src/main/java/es/upm/fi/dia/oeg/map4rdf/share/RDFDisplayer.java
modified:   src/main/java/es/upm/fi/dia/oeg/map4rdf/server/dao/impl/DbPediaDaoImpl.java
	modified:   src/main/java/es/upm/fi/dia/oeg/map4rdf/server/dao/impl/GeoLinkedDataDaoImpl.java
	modified:   src/main/java/es/upm/fi/dia/oeg/map4rdf/server/dao/impl/VCardDaoImpl.java
	modified:   src/main/java/es/upm/fi/dia/oeg/map4rdf/share/RDFModelProcessor.java
fixed fileName setting
Change directories to make things simpler.
added license header
cleaned up parameters
hide future plans too
v3.6 added multiple line highlight and support for icplusplus.com articles
Allow jdkversion as a param to install_java
Added a directory for the TDL (Template Description Language) files, i.e., templates to generate images, for instance with Oz or image-factory.
Site updated at 2012-11-03 16:18:10 UTC
Site updated at 2012-11-21 02:25:29 UTC
Now plays the voiceovers for the medicines.
adding creatures
Added license comments to remaining files.
adding scaffold templates optimized for bootstrap with localization support
adding "country" model
fix connection open crash when url including chinese charactorer
Revert "Updated submodule last reference is working with gh-pages generation"

This reverts commit 24217f163056808358003cce62cc30595a82a89e.
Testing other reference
Edited readme file
Text edits, remove unneeded elements, correct spacing on new page
navを丸ゴシックに。
Missing backslash

Change-Id: I95b126f2fe694697de84be25fe0b56f333bde90c
dummy file for commit testing
Changed cividiscount_civicrm_buildAmount() to remove extra _allow_multiple().
update modifications
breadcrumb improvement
i9100g: remove mass storage entry from storage list

Change-Id: I757362421797950b1a8c031db980aa36441a5154
Replaces count calls with semantically correct empty calls
Merge pull request #39 from Gravatronics/enhancement/countToEmpty

Replaces count calls with semantically correct empty calls
Removes/Replaces whitespaces
Merge pull request #40 from Gravatronics/enhancement/whitespaces

Removes/Replaces whitespaces
Added support for RSS feeds
Fixed submit button
Added ability to add new participants
Added notification for newly added participants
Fixed some small issues
Fixed label management
Added usage bar styling
Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
Renamed template
Added tooltip
Fixed permission to add new participants
Fixed update of participant summary
Changed error handling for 'add participants'
Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
Added option for 'participantCanInvite'
Fixed permissions for 'add participants'
Build ROMControl
fix boot with missing fixes
try CAF rild code with new java
Updates to Readme
Have makefile generate documentation during build
Merge branch 'master' of github.com:JesseKPhillips/Juno-Windows-Class-Library
Added some javascript classes to clean the code and make things easier to implement.
- Also added a settings file.
Merging Conflicts
add TLS module (thanks to nadlabak) + auto search adresses
hwcomposer: Add HWC_EVENT_ORIENTATION to hwc

Change-Id: If15b475173600d2467d7fbdd43b428b4bdd94d8a
CRs-fixed: 382796
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_hardware_libhardware into jellybean
created timescale
Merge branch 'master' of github.com:SwanseaSoftwareEngG6/Assignment-6-Project
Update Classes/Task.java
fixed build problems, included jquery and added json dependency.
made some changes to checkout layout, reset function for cash does not work atm, tax is used correctly on cash flex and punch
Add end call button to notification panel
Adds the option to enable/disable:
Landscape while in call,
access to the StatusBar while in call,
LightsOut (NavBar buttons faded out) while in Call.
Also need settings commit from:
https://github.com/Zaphod-Beeblebrox/frameworks_base/commit/ac4e7296ac10aa3c45af605cbde7584482c27960

New options are in settings menu of phone.apk.  May require reboot between changes.

Conflicts:

	res/xml/call_feature_setting.xml
Settings now handled via Preference manager and properly respond to changes without rebooting
added option to exit straight to home screen
Adjust Landscape Layout/Remove Image Width
fix landscape call when landscape setting not enabled.
Realign multiwave on landscape incoming call

Conflicts:

	res/layout-land/incall_touch_ui.xml
make call screen semi transparent to see the caller image
Makes network mode toggle work. Port from CM7.
Merge branch 'ics' of https://github.com/ThePlayground/android_packages_apps_Phone into ics
Implemented standard deviation.
fix adding problems
v. 0.9.1

* Error fix
Official release of 1.5.1
Merge wxOpenCV to UIMainWindow
Refactor NotificationService and DeviceService to ios specific package
change the routes also
Refactor cache system for JSON Object and WSCall
Refactor NotificationService and DeviceService to ios specific package
change the routes also
Merge branch 'cache'

Conflicts:
	app/cloud/Connectivity.scala
	app/controllers/api/TwitterService.scala
	app/controllers/api/ios/NotificationService.scala
enforce masks over nan matrix entries
Message references 'host' where 'guest' was expected. Improved messages.
Зробив звіт в HTML з "няшками", підправив трабли. Ну вроді би все працює.
first commit on win7
Merge branch 'master' of https://github.com/bakerjd99/Analyze-the-Data-not-the-Drivel
revert pull commit from github
Git me a Hubbery: post 3348
Git me a Hubbery: post 3348 epub
clearing conflicts
merge in wun7 branch
Cleaned up Tests, upgraded Spring to 3.1.2, Added a MTOM test
Switching to SCSS
The box head for the introduction editing.

[#39101279]
Adjusts width of edit box for page intro
Positions the editing buttons for [#39101279].

Hiding the "edit" link when edit mode is started isn't too hard. However, I'm having trouble re-showing it when we leave edit mode. For the moment, I've left it showing in edit mode, but obviously that's not desirable.
Changed line different to a more lengthly text
Updated doc typos
Added desig properties and fitted several code lines for new source code
Added information about the whereabouts of the scenario

Since a lot of people asked me what packages are being used at the moment and which sense they have, I wrote a short description about the scenario.
Changed location costmap parameters again to fit those of bullet reasoning
Convention fix and removal of dead import
Configuration of RubyMine for runnning examples with Spork
updated web.xml and webapp-context.xml config
Add service activator
app/assets/images/b_header.jpg
	app/assets/images/btn_1.gif
	app/assets/images/btn_1_over.gif
	app/assets/images/btn_2.gif
	app/assets/images/btn_2_over.gif
	app/assets/images/btn_3.gif
	app/assets/images/btn_3_over.gif
	app/assets/images/btn_4.gif
	app/assets/images/btn_4_over.gif
	app/assets/images/btn_5.gif
	app/assets/images/btn_5_over.gif
	app/assets/images/file.gif
	app/assets/images/h_news.gif
	app/assets/images/h_quotes.gif
	app/assets/images/h_services.gif
	app/assets/images/h_welcome.gif
	app/assets/images/icon_plus.gif
	app/assets/images/img_welcome.jpg
	app/assets/images/logo.jpg
	app/assets/images/slogan.jpg
	app/assets/images/spacer_m.gif
	app/views/patients/home.html.erb
	public/index.html.old
fixing classname typo
isHidden instead of hidden
NBC - Use player from embed code instead of the one embedded in the website
fix proto text format.
Localisation updates from http://translatewiki.net.

Change-Id: Idc87cbd4f0adf061e3fda0421ba48865cf9d647c
Added caching support
Fixes several caching problems
Added File Resources to the ConfigCache
Merge pull request #26 from thaberkern/Caching

Caching
Edit build script to properly find threads. Ensure proper building.
Update notes for submitted changes

* Revert "msm8660: disable electron beam animation to avoid surfaceflinger lockup"
added restore functionality
Merge branch 'master' of github.com:Bonobolabs/ios-in-app-purchasing-framework
Revert "LatinIME: volume cursor keys"

This reverts commit 3941ad85cdbd1c7d62eb4aa5b0c7a7494db64895.
import some translations (cm)
Update notes for submitted changes

* epicmtd: Enable WebGL by default
Update notes for submitted changes

* German: Stylus gestures
Update notes for submitted changes

* PT-BR: Various missing translations
Update notes for submitted changes

* Allow airplane and silent power toggle (1/2)
test

test, no n, go away, pls
d2: add provide liblight =true

Change-Id: I9480495663ba1108c4db434e1d166b8f7c329d5e
d2-common disable overlays

Change-Id: I731c22e28ca2322829dd86081f9de03c7410ad0a

Conflicts:

	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/packages/apps/Settings/res/values/bools.xml
	overlay/packages/apps/Settings/res/values/config.xml
d2: ramdisk fixes

Change-Id: I4f63d8654f64e4a2941c6172fd1399f8697b9c81
d2: add effect config

Change-Id: I40b48c6c4e5b228b260929a388eeb52d67a79d12
D2: Fix storage daemon

Change-Id: Ic1409c799c166aa7e9e55e39aa58c86576c527f2
d2: add bluetooth config

Change-Id: I8a7476d69ca0e76780cc8c691caa121ee35273f2
d2: Update audio policy for MR1

 * Remove unused devices, add new devices

Change-Id: If20443794657c392a993dd82e341e3bf6457eebb
d2: Fix startup of rmt_storage

 * Use new ro.boot.emmc property since ro.emmc is deprecated.

Change-Id: Ic47176dcc94c87dee707f5fdb7d9a875a30838c7
d2: Fix path for JB RIL sockets

 * New RIL uses different paths

Change-Id: Ia65eca60e52d6d4bd348aed39ea389eabd63305e

Conflicts:

	rootdir/etc/init.qcom.rc
zeus: proximity sensor fix

Change-Id: Ide68e63a4a40bf615b0e335398b2eab17322191b
Merge branch 'jellybean' of https://github.com/CyanogenMod/android_device_semc_zeus into jb
Attempting to fix lights
Deleted ignores, using ignores from another repo
Published the new snippets list
Changed name of error parameter in printStdOut

Changed name of error parameter in printStdOut to force to reflect the fact that it is used to force printing to standard output when verbose directive is false.
Revert "Transfer linking to the existing camera libraries for building"

This reverts commit fbb926e1c924f20cbbe2003b47347e50fc4fe016.
removed duplicated definition of the ListName
Add some cmd line help and fix compiler warnings
Just now realized I omitted the PostBack check in my Page.OnInit event handling.  Sigh.
Update camerahal/Android.mk
Site updated at 2012-11-06 15:01:29 UTC
css tidys
jb maserati fixes
picture updates and other pages added
add arduino page
Corrected stagefright
media: add forgotten config for codecs
arg_file change to FILE *
forgot to actually include the new files for pagination improvements
added the new file after some accidental commits... I'm new to the command line git..
Added ROOT_URL
always return email, even if blank
limit commits with YQL, not client-side js.
added check stacktrace to git ignore
ref #63 completed basic dev environment setup script
changed onComplete and onCancel of the post-to-wall DialogListener to return meaningful JsonObject to callback
fs: add field to superblock to support cleancache
Fix typo in link to resume
don't need this
Merge branch 'ics' of https://github.com/squash-/android_kernel_samsung_epic4gtouch into ics
http://openenergymonitor.org/emon/node/841 Submitted by calypso_rae on Sun, 15/07/2012 - 17:03
Readme update
Fix up releasetools and ensure buildability
Added "Claims-based Authorization" sample (base)
Release of v. 0.13
Added entries p. 90
Localisation updates from http://translatewiki.net.

Change-Id: Ib7e4fdc74d62b1da7d10d41d6f5010b2bc27fd5c
Fix for users who set the Word startup directory to the Zotero install directory (why!?!)
Flip to snooze alarm

Change-Id: Ia4fd8fa16a54ac194e2ed03da29f889927c763bb
Merge pull request #1 from burstlam/gingerbread

Flip to snooze alarm
bumped version.
Merge branch 'release-0.2' into develop
random noncalled thjing
zeus: sdcard permission fix
[WIP] XML Permissions, Starting on commands
More work on the XML permissions
dpram fix
e4gt: Remove overlay added by cm.

Change-Id: I8f3308e3554779d1532b50f4bffaf1d7de6f227b
e4gt: Change device codename, and remove overlay for hot reboot for now.

Change-Id: I41e6125d985d848841e012a5bb810795dc874b3d
e4gt: remove backup too from ota script.

Change-Id: I619eab89ce0b476a4cfb7e083dd8a5bd6a58b213
make call screen semi transparent to see the caller image
Made the background of multiview 25% Black
Make national data roaming optional (2/2)
Fix Checkbox not staying checked
Added parameterisation
Here is the french translated .po file. Once merged, I'll check if all the strings are Ok. For now there seems to be no missing strings, but I'll wait the final merge and tell you if something is needed. Thanks for the new .pot file.
ignore test*.* from repository
Created E step
Merge remote-tracking branch 'origin/master'
Fixed some spelling mistakes.
Added the Target example for using WebSockets to push a message to a target user.
stuff
Get something working finally, wooo
Woo
openDialog function returns CURLCode
Added whitelisting for filetransfer upload/download
test/test-app/manual/framework-split/cards.htm
Merged native code (compiles)
Adding a fix to prevent the event from firing more than once
Reviews as children of teams.
Added DisplayAttributeGroupRepr
Reworked the widget initialization code
msm7x30: Camera HAL for HTC Sense devices (1/2)

The proprietary camera files must be from an HTC Sense build for this
HAL to function properly. These files include:

libcamera.so
libmmipl.so
libmmjpeg.so
liboemcamera.so

Face unlock and panorama are supported, if available.

Required:
http://review.cyanogenmod.com/#change,13317
http://review.cyanogenmod.com/#change,13285

Optional (preview issues):
http://review.cyanogenmod.com/#change,13564

Notes:
CAF parameters are provided to support building the CAF camera
variation, but will not interfere with regular functionality. They are
simply enclosed for organization
wifi: Choose correct nvram file on samsung hardware

Change-Id: I9d428ae61c1ce80d97e6ea513839ed64e8f61440
AUDIOLEGACY

Change-Id: I28f9dd4511c76c0abe1fffed55d9d332ac95f607

Conflicts:

	audio/Android.mk
	audio/audio_hw_hal.cpp
update Changes
tweak test
update META
Clean up

Put the first 6 functions in order and clean up some things
d2dcm: update proprietary files
build: update release-note
ZRAM for ANDROID
wakelock: (tungstwenty's implementation) plus lots of other additions
wakelock: remove sync workqueue
added new file for Alphabetize Array problem, removed broken file
Updated default launch settings to be less aggressive
ステータスがない場合はバッヂを表示しない
Observer 周りを整理
バッヂを未読数表示するよう変更
Merge branch 'unread'
fav_shop の CSS 追加
レイアウトを調整
Merge branch 'style'
options_page の準備
options.html の UI 作成
option の保存/読み込みアクションを作成
通知を実装
Merge branch 'notify' into options
Merge branch 'options'
局所関数を無名関数内に移動/整理
通知について README に追記
Version bump to 1.3.
Added a test to cover when no token is passed
Removed the dependency on rack-oauth2
Bump version to 0.0.2
make render running with original Mathjax
fix the meta tag
Merge branch 'original_mathjax'
tweet button added
site css fix
Revert "Add Stk application"

This reverts commit 2ab53924152db4728a2504d23f84effdf347f88d.
Settings hungarian translations with Tamás Tóth

Change-Id: I781bed149a6343af08b440de6089d222317c3ce2
Polish translation update

Change-Id: I28ef0b188b70c6b5b190a55ba3f2a92a7920638a
Merge "Polish translation update" into ics
Settings: Remove redundant ProfilesSettings file

Change-Id: Ia19bc68b85497403ecec5410c56257737b9e3a21
Merge remote branch 'upstream/ics' into HEAD
added base tests with no spreadsheet support yet
pull from spreadsheet - jasmine test still broken
reduced the width of zip4 field to avoid flow breaks
iosched 2011 snapshot
Initial iosched 2012 snapshot. Certain features are stubbed out, including YouTube integration, Analytics, and the +1 button.
Change support lib symlink in ABS directory to actual copy for Windows users. Fixes issue 31
Minor GCM updates
Update remote image loading and caching classes.
Fix ImageWorker build issues.
clone of google io conference app
aspekt estetyczny aplikacji
+ resources
Merge branch 'master' of https://github.com/AnomalyDetection2012/AnomalyDetection2012PWR
P1Parts: remove Wi-Fi Power Mode settings

Change-Id: Ie0a07dbb9e0238d60ee3f543ca60e237dae07944
Update notes for submitted changes

* Fix TVout
Terms sorted by name
Use a PageSingleton to store the current page(s), optimization of FiberPageMixim.get_fiber_page function (stores the same page as the PageSingleton), removed handle function from Page model, removed call to handle function of model (extra handlers should be implemented as context processors now with a check if the page is an instance of the right subclass; a context processor per subclass of Page)
patched seconds
I made the ship super better by making it all one piece for the main body. Next up, it gets an obvious gun on the tailfan!
Settings: Data usage: Linear chart option and 2GB to 100MB vertical axis limit.

Add a menu option to switch between logarithmic and linear chart.
Set vertical axis limit from 2GB to 100MB and add more grid steps, for show all linear values properly.

Change-Id: Ia84ad580d9727ce9168f789fb15262c5c03ac8af
Version 1.12
Added "align tangent" scripts.
Added undo support to most scripts.
Added error dialogs to most scripts.
Refactored the project structure.
add mysql-5.1.55
resolved conflicts for merge of f11958e1 to graphics-dev

Change-Id: Ib0abb05c4e2e77d64956726c35cd7a0cbd79030b
am f20d3cc1: am c61223ce: (-s ours) am cd92dd07: Import translations. DO NOT MERGE

* commit 'f20d3cc11bd2a393f7065c4c2985b0e52ffc23c7':
  Import translations. DO NOT MERGE
am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE

* commit '940f2a7479eb68af290f631d227bc79dcf29a7c5':
  Import translations. DO NOT MERGE
am 201a77ea: (-s ours) am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE

* commit '201a77ea399527da0f69faf14cc26162909f43c7':
  Import translations. DO NOT MERGE
am ce4bce00: am 201a77ea: (-s ours) am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE

* commit 'ce4bce00eb0ef282ebea715dc7cdc7fafce3f84b':
  Import translations. DO NOT MERGE
resolved conflicts for merge of 67a50f99 to ics-scoop

Change-Id: I75009fa3089704e2b5045fda6716f733ae2b06fa
resolved conflicts for merge of 67a50f99 to ics-aah

Change-Id: I14ffa78c503c91b615e353941a79ea0f8a85bb5a
resolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp

Change-Id: I2b80331b5c56eb46b88513bc841f54001405a5fc
am 175f4154: (-s ours) resolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp

* commit '175f4154a6c0ff0917d56d67a1ad22d883eadda2':
am 6fa18274: am 175f4154: (-s ours) resolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp

* commit '6fa18274e5435ba29e9bb3df812fbe980620895c':
New switch to enable/disable all developer settings.

Turning the switch on shows a dialog warning the user to not do this.

Turning the switch off resets all development settings.

Change-Id: I052b16e6d220fa60298799ace02e69a8a1a02ef2
Merge "New switch to enable/disable all developer settings."
am 840c6bfb: Merge "New switch to enable/disable all developer settings."

* commit '840c6bfb96201b5e187616c11fa1944b321a65c2':
  New switch to enable/disable all developer settings.
Update for NetworkPolicy refactoring.

Bug: 5262414
Change-Id: I17db862cc20a11f022dc2d02993ad52988618681
Merge "Update for NetworkPolicy refactoring."
am 0370b9c3: Merge "Update for NetworkPolicy refactoring."

* commit '0370b9c3f76584462cffc3c283fcc70d9c8419c1':
  Update for NetworkPolicy refactoring.
Import translations. DO NOT MERGE

Change-Id: Iecfdf16111ff8870a29cbc4d2b1280699d2997a2
Import translations. DO NOT MERGE

Change-Id: I3b212608cb7a1ac013eb37ff57092adf8680a439
Import translations. DO NOT MERGE

Change-Id: Ic23ab755fb8351dfd34f1da3943b1cd8b475e923
Import translations. DO NOT MERGE

Change-Id: Ice4cc1cd0d6b9ec2b7eca8cec68ff36aa8d49945
Site updated at 2012-07-10 15:51:10 UTC
Tried changing the selector to no avail.
Revised README to include bug description related to automatic build

Also deleted redundant and misleading Matlab.sublime-build file.
added a free camera.

to do : add zoom in/out feature. then adjust the mushroom's size.
removes a couple scratch files
renames module to global_climate_dashboard; cleans up config settings
Huge update: enabled Zram support - add NSTools - cleaned a bit my initramfs
Add namespaces for as Wikisource

Change-Id: If2a40774bf6fe0053a9ccd165b7d1c53a0012565
(bug 43344) Improving PHP strict compliance

* Fixes "Undefined index: formHTML in specials/SF_FormEdit.php on line 109"
* Fixes "Undefined index: formJS in specials/SF_FormEdit.php on line 113"

Change-Id: Id19b4e9291c9e3a8e5f22cb3f260fce895092cb1
Merge "(bug 43344) Improving PHP strict compliance"
Fix typo.

Spotted by Base on translatewiki.net.

Change-Id: Iafa36096ce9bf3aed42dab585295b956983e44de
maybe fix navbar image on ldpi
fix navigationbar while fullscreen
msm8960-common: build color conversion library

Change-Id: Ia331f16395c6f2c850cb8009f76d3169863306f5
Update notes for submitted changes

* mogami-common: fix Wi-Fi tether
Initial Commit
Extended Readme
Release version 1.0.0. Aug 27
added php5-cli, pear and phpqatools
CM9 board cleanup
Merge branch 'jb' of github.com:STS-Dev-Team/android_device_motorola_maserati into jb
use init.rc from system core
updated fingerprintzzz

Change-Id: Ia376c4a447073750cc39a47c1763f5929ee3b1c1
Update MenuBuilder to follow changes of KnpMenu
[toolkit] it's now possible to include external modules
Merge branch 'master' of git://github.com/constructions-incongrues/ananas-build-toolkit
Changed SDK.
Gestpay payment gateway in <iframe> + minor improvments to payment process
Some fields in the registration form can be configured to be optional
add version.php
updated to bootstrap 2.2
Merge pull request #24 from thedannywahl/add-version

add version.php
the actual theme name
point to demo site
fixed url, update todo, closes #23
cast any texty content but arrays to string

You can pass anything but arrays to texty classes without needing to
cast them explicitly to string now.
some caching for compiled less
variable padding for static navbar
Add user parsing tests for easier debugging.
Update tests.
Localisation updates from http://translatewiki.net.

Change-Id: I633ab0c18dbb739586c49d6c7d2d111a76a5978e
Localisation updates from http://translatewiki.net.

Change-Id: Id35117c07d31c500dbc7cb8bc5af52d662e1abf7
Localisation updates from http://translatewiki.net.

Change-Id: I88a2a9295061ccf86ef13c5be65105533841cf96
Tons of kernel patches, lib hacks, rearrangement, and Init fixes
switch to new demo instance of Metitree
Add multiple UUID tags to profile (2/2 Settings)

Adding multiple UUID tags to a profile allows us to share a single NFC tag across multiple devices.

NFC tag writing works as before.
NFC tag reading is expanded to check the UUID and the UUID tags of a profile.

When reading unknown profiles, the user is asked to attach the tag to an exising profile.
The NFC tag itself stays untouched.

Patch Set 1:
* initial patch

Patch Set 2:
* change wording

Patch Set 3:
* add toast after attaching tag to profile

Patch Set 4:
* rebase
* adapt to Framework Patch Set 2

Patch Set 5:
* fix German strings

Patch Set 6:
* cleanup
* remove redundant if clause

Patch Set 7:
* cleanup imports (sorry for the commit spam)

Change-Id: I593240570772013ded263352421d51be6a6d0415
Update Japanese translation.

Change-Id: Iaae174e199b25827974d4bde5b149153ed51910e
Update Russian Translation-DHCP time lease-CM9

Conflicts:

	res/values-ru/strings.xml
Add The main File
Updated sample for abandoning sessions/timeouts.
FUll path of the migration
Nov 9 notes
init project merge
Removed under construction remark
Initial git import from SVN export
add host-page
Created first quad tree implementation

Problems with querying.
Added features to QuadTree

Max depth, remove, many testing / debug features.
Cleanup

Small fixes.
Merge remote-tracking branch 'origin/QuadTree' into Core-Finish

Conflicts:
	PrisonBreak/PrisonBreak/PrisonBreak/PrisonBreak.csproj.Debug.cachefile
	PrisonBreak/PrisonBreak/PrisonBreak/Program.cs
	PrisonBreak/PrisonBreak/PrisonBreakContent/PrisonBreakContent.contentproj

Merging Core and QuadTree
Localisation updates from http://translatewiki.net.

Change-Id: I2afa1696a2863ee7dd6ef6060ada8a008e4b4b8d
You call it work, I call it avoiding the real solution. Oh well
Merge branch 'release/v0.1.0'
Adding Gemfile
Merge branch 'hotfix/v0.1.1a' into develop
Display cerebrum version in Settings -> About phone

Conflicts:

	res/values/strings.xml
Forgot to include color picker layout

Change-Id: I4ad5a5bc2fbbcd12ecca459c52b047aad8b80e45
fix broken (negative) test url (oops :)
Correction de fixme
creation de la methode toString pour la classe Carte
montblanc: reuse TI softap

Change-Id: Ie4ca2c236a72037b4cef3e2d2605dff92b693a04
montblanc: kernel cmdline cleanup

Change-Id: I54666ce8910f4dfa2fec39703c52f2a861a8cb0e
Merge "montblanc: reuse TI softap" into ics
Merge "montblanc: kernel cmdline cleanup" into ics
Removed episode files
Memory management: Fix title
set cat rank in collection initializer
test case to strip vendor
strip vendor
Switch to LEFT JOIN, inner will block other ACLs
Corregido error que permitia solapar turnos personales cambiando el dia de la semana
small element renaming
Don't change volume if track switch has occurred.
Deined template and view for viewing poll results
Site updated at 2012-07-31 07:20:57 UTC
max8997_vibrator: user configurable vibrator intensity

Based on codeworkx's GT-I9300 implementation
LDS eingefügt matlab datei
added opacity slider for the sidebar
restructured demo map layout
we will need to replace the map with a static image later