labofsahil/github-event-dataset-2012 huggingface dataset:
META-221 - writeReplace method conflicts with javassist writeReplace when running Openmrs 1.9
Added git ignore to .settings directory
Fixed HTML-360 - Support for setting the default encounter location
based on a global property or a user preference
Merge pull request #20 from djazayeri/master

Fixed HTML-360 - Support for setting the default encounter location based on a global property or a user preference
Applying auto format changes
Add ability to specify the Encounter Type from a specified list of
Encounter Types while filling out an HTML Form - HTML-88
Revert "Add ability to specify the Encounter Type from a specified list of"

This reverts commit 12d1827ba5a24b3369e5f9cbaa58071465d21ddd.
Revert "Applying auto format changes"

This reverts commit 8e63f6acdf08a1ff8d3a67ae0b17af5163adb36f.
Merge remote-tracking branch 'upstream/master' into HTML-72
corrected getSetter method for setProvider and defaultOptionPresent value, changed EncounterLocationTagTest
Tidied up tabbing/indentation

Automatic tidy only using find and replace.
Changed null values to constructors
Added generalized method for actions and listeners to deal with random cases of editor not being active



git-svn-id: http://svn.jboss.org/repos/jbosstools/trunk@44343 a97e2381-89e5-4abb-bab3-167db6db766c
point default juno extras site to new SR0b site (includes newer GWT 3.1.0 instead of 3.0.1; hope that won't break any Alpha2 users)

git-svn-id: http://svn.jboss.org/repos/jbosstools/trunk@44344 a97e2381-89e5-4abb-bab3-167db6db766c
JBDS-2278, JBIDE-12498, JBIDE-12497, JBIDE-11167, JBDS-2235 - add GWT Designer/WB and Android Tools to Central

git-svn-id: http://svn.jboss.org/repos/jbosstools/trunk@44345 a97e2381-89e5-4abb-bab3-167db6db766c
Added and testing ICMP/TCP search
Find Server using ICMP Echo or TCP Port 7 Echo Request Working
Added integration tests into the main repository.
tryinig to get demo data pull to come up
form validation with wtform and mongoengine models
update main route
Use valueForKeyPath: to traverse down into dictionaries
Merge branch 'master' of https://github.com/danielctull/DCTManagedObjectSerialization
Yet another typo

Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
index.html div for weather channel
correcao no js
Remove usage of shlex.split as it's bugged in python 2.6

See: http://bugs.python.org/issue6988 (ok ~before and ~after)
- Added data and operations
SystemUI: Use Settings.Global.getInt to read global settings

Settings.Global.getInt should be used instead of Settings.Secure.getInt
to read global settings.

Change-Id: Icf8b9b2c9f04d4a111e5cc165e090aeb996f91b1
SystemUI: Request CHANGE_NETWORK_MODE permission

com.android.phone.CHANGE_NETWORK_MODE permission is required for the
network toggle to function properly

Change-Id: I88a6f6705553fcb08bee5e8308e89395a4749e4f
Framework: Bring Long press back kill app toast back

It is now supported thanks to pawitp commiting the context fix for
displaying framework toasts

Change-Id: I8ab1beb49fc3b61355de8bc207482e2f51ff3e2a
Merge "SystemUI: Use Settings.Global.getInt to read global settings" into cm-10.1
Merge "SystemUI: Request CHANGE_NETWORK_MODE permission" into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'origin/cm-10.1' into cm-10.1-sgt7-linaro
Fixing translation key.
trailing whitespaces deleted
first version of an abstract is there
bullet points with some ideas what should the sections include added
bugfix and additional methods
isOverlayVisible method added
Merged in PR and bumped version number to 1.2 (creating new compiled version too)
updated readme
email do chico
Updated board chipset / gpu (may still be wrong, but worth a shot for fixing graphics)
Add Compass compile step

Signed-off-by: Ian Anderson <ian.anderson@nq.com>
update
so many more licenses
added 2 test for TypeInfoValidator.isArrayLookup (now with EXPERIMENTAL
flag disabled)

dynamic array access is a choice of the users, if they do that then what
comes afterwards  should always be allowed
tests: "if (notYetImplemented()) return" for the failing tests
Method param types should go over RTypes.create so that we get a IRType
(that can be Any) just like javascript methods that already have the
IRType)
JSTypeSet.toRType() documented
tests: don't use extractType() here
read me and initial sources
wyswietlanie zon z xmla
filtra cleaned
Set payment status to failed in PayPal IPN for #556
Updated admin-scripts.js to master version
Added JS to hide/show local tax opt in
Mejora en la eficiencia del show de formularios.
Merge remote-tracking branch 'origin/develop' into develop
bugfix for search results
replacing $ with jQuery to allow for use of prototype along with jQuery if desired
also correcting spelling of JQuerySupport (was JQuerySpport)
Merge branch 'master' into bugfixes
try to change readme :)
now it unregister client in server when the gateway goes off normally
Fix GL_OES require and enhance preview ratio tolerance (wide or not)

Change-Id: I1a02f7dc723708270ee6b7abf1b04e262ae5be1b
fix after merge

Change-Id: If532cdd864cbce1e6fb95adbf375f4fba05449a5
adding EOF to complete script
Update readme with updated steps and title
Moar Optimizations
Ream Me
revert specific binaries

Change-Id: I8dd9e237e0f88dea5b3290d3589b8dfc6b444679
Added Parameter for the Number of Bubbles created per Frame
part 1 and additions to part 2
Update Logisism_2.7.2_fragile/Logisim Fragile 2.7.2/src/com/cburch/logisim/std/arith/Shifter.java

Comments added
Update Logisism_2.7.2_fragile/Logisim Fragile 2.7.2/src/com/cburch/logisim/std/arith/Shifter.java

Added constants for the box size and added more comments.
fix view without sidebar
Merge branch 'master' of github.com:stfalcon-studio/opencart-theme_tecart
simplify script installation
Typo thanks pkt_lnt
changes for loading wait and prepopulate
core 0
Merge branch 'master' of github.com:victor-anubavam/real-estate-dashboard

Conflicts:
	app/webroot/css/style.css
Localisation updates from http://translatewiki.net.

Change-Id: Ieac1efeb73015f04a00ede630e5801be715d0f27
pts for/against/diff initialised on init for easier access
Check on ignored file
notes: morning review
changing deprecated rs_utils_marker to rightscale_marker
cleanup pass one
added BioConductor repository
run Finance last because QuantLib takes so long
audio: Disable debug messages in log

Change-Id: I7d4eae80e7603445813c4bf87d07a5e73223b3b5
add WITH_QCOM_LPA flag to makefile

Change-Id: I0f595f8b806ea5b3904dec93d6ebb1828b2b7231
hardware/qcom: msm8660: Fix FM audio getting muted at volume level 1

- FM Volume is getting muted at volume level one
- Corresponding linear value for volume level one is lesser than 0.5 and
  it gets rounded to zero and hence volume gets muted
- Fixed this issue by rounding the valid volume values to the nearest
  higher integer value so that such lower values are not ignored

CRs-Fixed: 337127
(cherry picked from commit 9d22f97b17ddcf4bc3c08b200a3606c6ee1f6e73)

Change-Id: I7845e1612afa1c30fc52196ac340fa2d28ec8303
hardware/qcom: 8660: Fix voice call mute issue after VOIP

- Observe CS voice call become silent after Voip call.
- Incase of mDirectOutput is opened multiple times,
MVS driver is not closed and Rx/Tx devices are not
de-routed even after Voip call terminates.
- Avoid creating mDirectOutput if already exists. This will
close the MVS driver properly,Rx/Tx devices are de-routed
and will not result in any issue for next usecase.

CRs-Fixed: 337952
(cherry picked from commit 078cff577844d25baf70126910f8ba89fbc6c73a)

Change-Id: I2295f85f841fa3c2e8009db39e369046dd2a595f
hardware/qcom: 8660: Fix video gtalk call with no voice issue

- While Video voip call, no voice is heard at all.
- Here, Output Stream open does MVS driver open and increments
the voip stream count. Then Input Stream open checks the
MVS driver is already opened and returning without incrementing
the voip stream count. As a result, standby called after Input
Stream open will use this count to check whether both Input
and Output streams are active. But as count is not incremented
in Input stream open, it assumes only one stream is opened and
results in closing of MVS driver which is not expected and
causing no voice packets sent to downlink and uplink.
- Increment the voip stream count both in Output stream
open and Input Stream open even if MVS driver is already
opened. This will reflect the voip stream count correctly
and avoids failure cases like this.

CRs-Fixed: 340102
(cherry picked from commit e935fb0461269b151c3db74d73de0d349c6701db)

Change-Id: Ifbcfb9ba6c60f49b5f2b8f456c24b5d5b0792cb3
hardware/qcom: 8660: Fix voice uplink distortion in VOIP

-When Gtalk voip call is used, observing distortion on
uplink voice.
-There is a sofware bug in the code while returning the
number of bytes read from HAL StreamInVoip read. The
upper layers rely on this value for calculating the delay
to read the next voice uplink packet. As this value is
returned 1280 bytes instead of 640, it is resulting in
20ms more delay for each packet read and causing
packet drops and disortion in uplink voice.
-Fix the issue by returning the actual number of bytes
that are read from MVS and filled into buffer.

CRs-Fixed: 331850
(cherry picked from commit b2a90147720040d6bdf8df0737370052507be7b0)

Change-Id: I662e3d47b919a20198b0203539ddb5d5bb2073ea
fix some troubleshooting questions ...
see http://docs.rubygems.org/read/chapter/19
Merge pull request #4 from Giiome/patch-3
tf700t: fstab: remove depricated nobh option

Change-Id: I23acf171bb579e09214b297cfcbec067d7b46ce6
Update notes for submitted changes

* cfg80211: fix regulatory NULL dereference
Update notes for submitted changes

* cfg80211: fix race on init and driver registration
Reef
reef
Add a StaticPages controller
Added home and help pages
Add about page
static page tests pass
Finish static pages
update to add /rest/ directory for REST update to arcgis portal
Mms: added the option to change the soft keyboard type when composing messages (CM9 port)

All credits to Gabriel Castro. Original commit in CM9:
http://review.cyanogenmod.com/#/c/17077/

Change-Id: I9bd661dac747652ad01e3b002aa294f691b87a37

Conflicts:

	res/values/strings.xml
	res/xml/preferences.xml
	src/com/android/mms/ui/ComposeMessageActivity.java
	src/com/android/mms/ui/MessagingPreferenceActivity.java

Conflicts:

	src/com/android/mms/ui/MessagingPreferenceActivity.java
Updated simplified Chinese translations

Change-Id: I6dfb4656e24cf11d5ad788986c2e3615119fb122
Mms: Updatech czech translation

Patch-set 2: More strings

Patch-set 3: Multi SMS reply

Change-Id: Ib7c3f7941cc09a463a75bec74aeee0f45b4dd67b
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
QuickReply: fix for home button

Fixes the issue of a random empty screen you got when pressing the home key

-Patch 2: cleanup
-Patch 3: updated how onPause is worked based on keyguard and screen on/off
-Patch 4: fix angry red squares

Change-Id: I797d64dc11bb6b8d1430bb0e562a4d76015346f6
Signed-off-by: Adam Fisch <adammfisch@gmail.com>
Hungarian translations by Klasszsrac

Change-Id: I33233b7be4ff058c3731188580697340c7d49f99
Signed-off-by: Gergely Szell <sethyx@gmail.com>
Quick Reply: Add option to auto-open QR when new msg comes in - AOKP

I know that this isn't exactly how Google wants notificaions to work,
but most 3rd-party SMS apps have this option, and I set it up to be
turned off by default.

Patch3: added code to prevent auto-open if the screen is locked
Patch4: fixed the pref description
Patch6: fixed a missing bracked from Patch5, added precautions
to prevent crashed if KeygardManager or TelephonyManager are Null

Change-Id: Ia5c91399c1c054e1f45f6f04a5bb247d264240f8

Conflicts:

	src/com/android/mms/ui/MessagingPreferenceActivity.java
Actualização do web service e cliente C++
Actualização da arquitectura do sistema

Foram actualizada a deployment View, criado o Diagrama de Componentes e
actualizadas as especificações das intefaces e suas estruturas
Actualização do log individual
preproc: start with _incomplete, fisish with _complete
Rename power folder
Allow for the user to manually attach source

We want the source code to be automatically added to the java
dependencies container but this will at least let the user add it
manually with the attach source button
acpu: OC up to 1.94GHz and uV 700000-1400000
Fixed exported data
add default fingerprint length to 8 and update documentation
removed bad extra criteria in equals override
power section pcb layout - alpha version
romain zijn zotte toestanden
DownloadFile methods returns null when getting an empty file [SPRNETSOCIALDB-9]
Added hashtags entities to Tweet object model [SPRNETSOCIALTW-9]
Normalize tabs/spaces for index.html
Removed call state code.
Made slightly more like AOSP's to try to fix boot

Change-Id: Ib5dba65046ffeda99471eba1378e7773eb50a914
- wrong namespace
proper metadata for factory's plugin menu
scatter chart renders cluster as color
folds give structure to pages read as data
ProgressMeterMacro: A friendlier message when previewing in a self-addressed non-existent ticket.

git-svn-id: https://trac-hacks.org/svn/progressmetermacro@11718 7322e99d-02ea-0310-aa39-e9a107903beb
ProgressMeterMacro: Major code revision and unification across the supported Trac versions.

git-svn-id: https://trac-hacks.org/svn/progressmetermacro@11719 7322e99d-02ea-0310-aa39-e9a107903beb
ProgressMeterMacro: Version bump.

git-svn-id: https://trac-hacks.org/svn/progressmetermacro@11720 7322e99d-02ea-0310-aa39-e9a107903beb
Site updated at 2012-08-03 12:48:59 UTC
working on blog theme
update to blog
finished blog theme frontpage
Updated Wage Calculator with Week 7 Revisions

Added:
- Variable to store employee's name
- promptForStringInput class to get strings from the user
- Archival version of Project 3-4 (Week6 Project 3-4 Original.zip)

Modified:
- Calculation of total pay is now broken out as its own method
(findTotalPay)
- WageCalculator.promptForInput is now promptForDoubleInput to
differentiate it from its string counterpart.
- Wording changes on documentation.
Now with acceptance testing
Merge branch 'master' of https://github.com/beCodeMyFriend/Cuore.html5-boilerplate
Merge pull request #66 from bhariharan/bugfix

Bugfix: Reset cached encryption key upon logout.
big layout change
forgot to  commit two important files
adding shells of new validation implementations needed
Bump version / changelog after release.
added xml-parsing function for SqlitePlatform
fuck you, startup yoda
finished code for sending history as individual URL requests to external API
initial custom boot animation support
setting up
setting up
set up PostgreSQL
use same view in laserscreen to oF, add drawing ground.
Add initial letter on the head of each performer, ground line and control of camera by mouse.
end of day commit 020512
minor changes to debugging and clocks
Minor tweaks
Got rid of curses underline, for compatibility with windows curses
Channel_Variables
Merge branch 'master' of github.com:freeswitch-cn/freeswitch-cn.github.com
fix Use channel variables in dialplan condition statements
Remove documentation on how to deploy on LemonLDAP::NG repo
Site updated at 2012-11-05 08:27:24 UTC
Site updated at 2012-10-14 18:49:52 UTC
From GitHub initial commit
ville: fix path to dalvik configs
ville: don't build recovery
ville: update location provider overlay name for JB
ville: disable CM-specific overlay options until they are re-merged
ville: fix liblight for JB
ville: update path of permissions for JB
ville: remove libsensors
ville: use JB sdcard mounting parameter
ville: convert init.rc mount to JB-style fstab options
ville: fix more deprecated property syntax

init should use ${name} for properties instead
ville: use JB init binary

Radio will probably fail to initialize, but fixing that can wait until
we can get a booting device.
ville: remove prima_wlan temporarily

Inserting this module causes the phone to die for some reason.
ville: copy default media_codecs.xml from msm8960-common
ville: update prebuilt kernel for JB

Contains changes necessary to build OMX.
Changed idStore_t into idStore_type to match POSIX naming convention
[FIXED JENKINS-15130] ‘descriptorByName/BuildTrigger’ ambiguous.
Site updated at 2012-09-12 14:22:58 UTC
Site updated at 2012-09-11 22:02:28 UTC
Octopress init
Site updated at 2012-02-21 12:06:00 UTC
Site updated at 2012-02-21 12:24:23 UTC
Site updated at 2012-02-21 12:28:15 UTC
Site updated at 2012-02-21 12:58:18 UTC
Site updated at 2012-02-21 13:02:56 UTC
Site updated at 2012-03-14 12:08:15 UTC
Site updated at 2012-03-14 12:44:50 UTC
Site updated at 2012-03-30 14:50:40 UTC
Site updated at 2012-04-02 14:15:47 UTC
Site updated at 2012-04-02 14:18:08 UTC
Site updated at 2012-04-02 17:06:34 UTC
Site updated at 2012-04-03 08:08:20 UTC
Site updated at 2012-04-09 19:18:08 UTC
Site updated at 2012-04-12 15:17:23 UTC
Site updated at 2012-04-12 15:45:55 UTC
Site updated at 2012-04-12 20:06:05 UTC
Site updated at 2012-04-12 20:09:23 UTC
Site updated at 2012-04-17 15:26:07 UTC
Site updated at 2012-04-17 15:27:30 UTC
Oops, I want to show the default theme first
added siesta for testing app
Deadly early morning
Added option to disable wordpress automatic P/BR tags; added support to the social wall
adding some older posts
matplotlib reference
Änderungen von Lentz und Conraths berücksichtigt
Call buildUIElements in Async.ItemView.render.

`Async.ItemView` overrides the `ItemView.render` function but doesn't call `buildUIElements` after the html is inserted. Adding the call to `buildUIElements`.
Merge pull request #1 from tgcondor/patch-1

Call buildUIElements in Async.ItemView.render.
added in foo bar service location
rearranged structure & added titles
conditionally hide member contact
added link to attachemt
added all link to menu filters
removed all highlight from single page
styled services a little
nishi renaming package structures
Merging issue44 to html5
lab9.
Yet another.
Improve language.
Typo.
Another paragraph.
theses are in arxiv now
pyramid: Disable scrolling cache
Signed-off-by: vorbeth <vorbeth@gmail.com>

Change-Id: I08dfbbb743e4d87b2d78d229ede0379ec8fdef85
pyramid: remove and clean out system.prop

Change-Id: I2c94ce6c149edac039e6f18884811c3be7c3a4cb

Conflicts:

	system.prop
Merge remote-tracking branch 'upstream/opensensation' into phs
Add skip to broker login
change url link to fork railsgirls-jp in 2012-04-19-contributing.markdown
Merge branch 'master', remote-tracking branch 'origin'
Some bug fixes, standardizing whitespace and quotation marks
Initial implementation for Employee default view
Add capability to save interesting directories
Merge pull request #6 from rcordovano/master

Added capability to save interesting directories.
lastest code from marcos
DI and doctrine proxies 20
cosmetic 11
Site updated at 2012-11-07 08:22:39 UTC
issue 11 testcase
calling iis7.5 link
update cpufreq modules

Change-Id: Ib05493d92ff4050b9d2b9a71fddeda37f2c43e64
hwui: move trebuchet blacklist in system.prop

trebuchet works but have minimal font problems with hwui
and can also some homescreen reload on application switch

Change-Id: I3c57e99ea489b12901a9b6b64b30fc07a78998ea
Connectors are now shared across multiple get calls
Finish implementing support for chute MultiImagePickerActivity
added david_ratner
Added info and example usage and test case explanation.
Added Export attribute to the translator
README.TXT was included in code kata.
Localisation updates from http://translatewiki.net.

Change-Id: I595a0aca554b1e3b46fa71348c44f31df06d5075
Make sure the EOFTk is preserved in the SyncTokenTransformer

And blame transformers when they drop it.

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

Change-Id: I8defe03cf97acbcfb30e1ae4c051105de130eaf4
Bug fixed for configure.ac
Fix inserting fields under Word 2008 (broken by 5e743276393300b031cf86c26102cb8849ffa7e5)
Don't set field text in bookmarks when unnecessary
Fix a bug updating bookmark text in tables
Rebuild
Renamed and refactored theme colour mixins
Replaced body font with mixin
Removed sans-serif rule for headings
Add texture and background for larger devices
Set header colour to pink
Created pink variant of paper texture and added mixin
set pink paper texture as header background for larger devices
Changed header text colour
formatted top navigation for mobile devices
Formats logo and menu for larger devices
Move background images to tablet size
Moved header background texture to tablet size
Removed bottom border from sidebar titles
Set colours and padding for sidebar titles
replaced solid colour with texture for tablet sized sidebar titles
Restored post index title to full size
Merge pull request #4 from AndrewAlexMac/feature-pagestyle

Design 1
Merge pull request #6 from AndrewAlexMac/develop

Deploy 1 - Attempt 2
Allow volumes to be unlinked.
Make the volume overlay more functinal.
Remaining bits for unlinking volumes
Volume rocker wake and volume rocker music control
Bug 396400 - BrowserHistoryEvent not fired anymore after page reload

https://bugs.eclipse.org/bugs/show_bug.cgi?id=396400

Workaround. Going back is now possible but the title is not updated
correctly.
fixed for Jellybean build of CWM

Change-Id: I05ad59676f1e939d6bd9e18e0e07dc83f0e187b5
	deleted:    recovery/recovery_keys.c

Change-Id: Ib3c4684bb79518fa975bfce4369f161f737d9a74
Merge pull request #4 from playfulgod/jellybean

Jellybean
Update notes for submitted changes

* Update Toro bootanimation.
Phone: Simplified Chinese Translations

Partially ported from CM9 with modifications and additions to
reflect the changes done to the English resources.

Patch Set 2: Fixed accidental change of msgid. My mistake.

Change-Id: Ibd9d9a8cf5fb1261a0c9096b09db9f40662c1106
Merge "Phone: Simplified Chinese Translations" into jellybean
REVERT: quiet hours
Quiet Hours (1/3) - CyanogenMod

Change-Id: Idc415ae0aa6d77ae819b829e02d5044bc4510b87
Signed-off-by: sethyx <sethyx@gmail.com>

Conflicts:

	core/java/android/provider/Settings.java
	services/java/com/android/server/NotificationManagerService.java
bluewall firewall (1/2)

mutes notification sounds for an application
  for <X> seconds after playing

patch set 2: default to 0 to disable

Change-Id: Iaf4661f9cda9ab257ec2282f01f2a2f240ed21e7

Conflicts:

	core/java/android/provider/Settings.java
Create new repository.
Initial import.
Change all copyright notes, author notes and other parts from InfinityLabs to InfinitySoft.
Upgrade to Aptana Studio 3 project.
Remove eclipse project files and add .gitignore.
Merge branch 'master' of github.com:InfinitySoft/contao-xnavigation-content
added red and blue coins to media
Revert "tf700t: fix usb storage and dock sdreader"

This reverts commit 7012358d55267bb03a216449cb23ddd086b4cfdc.
tf700t: remove 2nd USB port

the new tf700 dock only has one USB port, removing addtional port.

Change-Id: I1eb862d8a6f9f967bb46b68d5b223e7645840a03
tf700t: add various network settings

Added tethering, datausage and Google Location services.

Change-Id: I05c033c5d45aac0544f7148031ae6d88a64064a7
Liquify TF700T
draw polygons
Implement method hasNavigationbar through the entire interface

It was causing compilation crashes

Change-Id: I3448b3dd6e39422555b989b60b67180eda6ad565
Rewrite expanded desktop functionality based on CM entry

http://review.cyanogenmod.com/#/c/25011/11

Names are more consistent,  on/off text, sw600dp drawable

Patchset 2: Shortened string name, fixed build

Change-Id: I2dd395c7f27789311b09cd429359915287f97d2d
Make groovy 18 the compiler version to use for running regression tests (needed for spring-security import test which uses spock).
Revert "remove busybox symlink"

This reverts commit ba76678a94d489e95a39aabc9e6719991ba6ddc5.
major adb/usb rework
zooming in graph shouldn't have been enabled yet
thisをreturn
Paginated GET of guests
Fixed a bug preventing max/min-height/width from taking effect from the Tag Editor
Fixed a bug causing a width discrepancy
Theme editor shows theme info
Fixed an issue with IE 8 throwing JS errors for setStyleProperty
Підправив маленькі помилки
Adding wiki link to readme.
Made things easier for device tree
added config tarball
Started updating yaml file
fix hardcoded mdl_ prefix, add button to update analysis of files.

Conflicts:

	lang/en/plagiarism_compilatio.php
wtf?
Update res/xml/development_prefs.xml
fixing Debugging crash
hopefully fixing something
Update description and fingerprint to JZO54K

Change-Id: Icd201f6153df865b426506c75a5029266b0c8b50
Signed-off-by: Chia-Wei Li <dreamcwli@gmail.com>
Add published date to shared articles
mongod file output
Add has_form option to checks.

Change-Id: I5d6455bc0e86dd9713f0d20e14679326690c8928
Fixes: #1042 Web interface silently fails with passwords > 40 characters in length (gosa bug 1168)
simulate Assetic's FormulaLoader to prevent errors in LazyAssetManager
commit by genmymodel from www.genmymodel.com: v20121228_180340
cambiado el metodo de lectura de imagenes cambio radical pero ya no se presentan problemas por espacios o cambios en el formato como mas saltos de linea en el encabezado cambio para debate solo se cre un nuevo metodo se comento lo anterior añadidas algunas imagenes -a
Continue work on script driven testing

There appears to be a bug in the mock network implementation, ConnectClose
deadlocks sometimes with the mock but never with a real socket.
Code cleanup
Obsolete comments
Update plugin.php

cleanup code, allow template public, localize widget name, more detail on plugin header
UA code added
Added map to the Github page.
Removed unnecessary files.
Edits made to homepage.php text. div=class "image-quote-credit" styled.
graphs: made popup direction setter for edge
Added php 5.4 to environment setting.
Revert "temp fix build error"

This reverts commit 1d535d398b52f18b543f269edc58c195603c2b47.
Poprawniony schemat obiektowy
lots of extra features
bumped version - all specs pass
app.rb removed
Added filter and alert on properties with v/ long values
Add logging
Revert "Add logging"

This reverts commit 5c59df0bdc620181b7d71a0e51ea4b7fe426c8d9.
Fixed perfomance bug (repeated image decoding). Fire
ImageLoadingListener.onLoadingFailed() if decoding returns null.
Added DisplayImageOptions.transformationMatrix()
Exmaple: added DisplayImageOptions.transformationMatrix() usage
v1.5.2 Update Readme
Remove some overly verbose log lines.
Adding two comments
Added new open Ofbiz component view (Shortcut ctrl+alt+x)
Modified builder and nature. odified ctlr+alt+x ofbiz resource find. Added a basic implementation of Beanshell debugger. Beanshell debugger needs a patched version of beanshell interpreter.
Merge remote-tracking branch 'origin/master2' into openOfbizComponent

Conflicts:
	org.ofbiz.plugin/plugin.xml
	org.ofbiz.plugin/src/org/ofbiz/plugin/builder/OfbizBuilder.java
stage
Merge branch 'HEAD', remote branch 'origin/master2' into plugin1.0
sdfsdf
dsf
fsadfsadf
Latest and greatest.
Do Ofbiz loading operation in the background.
PATHC: applied linux kernel patch 3.0.40->41
Linux 3.0.42 patch
42 patch fixing - thx anryl
PATCH: applied linux kernel patch 3.0.xx->50
DTree with passing XOR test.
Use peritm 0.29
RTD builds with pip+virtualenv; remove old mocking code
modify Rakefile in order to push besides master branch
- added README.txt
maxclients and serverlimits rejiggering
remove kernel sync
fix boxes images on hp
Tamir updated the QSGs with the extends mechanism
Removed powerful
smultron: button vibrate fix
PT-BR: Added Missing Translations

Change-Id: I693937f4c38ae78737caba1691ebc4d8e971ad00
Merge "PT-BR: Added Missing Translations" into jellybean
Carrier Label Update (MIUI Style thanks to team gummy)
fixing astoria westbridge drivers
完成了框架的基本架构
语句通顺
Merge pull request #128 from maxupeng/modify

语句通顺
Update 2.2.md

aSlice = array[5:] // 等价于aSlice = array[5:10] aSlice包含元素: f,g,h,i,j
Merge pull request #129 from apaye/patch-3

Update 2.2.md
修改一些错别字
Merge pull request #6 from astaxie/master

merge from the source
athlete class added
COMTOR page done? except for images
Fix data toggle not updating propely

Reference: http://rootzwiki.com/topic/23450-magurotoromaybe-others-b32-mobile-data-in-data-usage-wont-update-toggle-in-pulldown-menu/

Change-Id: I956d39f9e03eaa6afc2cc775cc372a377864f536
Signed-off-by: Roman Birg <romanbirg@gmail.com>
add lockscreen wallpapers to pattern unlock

Change-Id: Id39fd36518881e1e01601bf2280a75a35d8f9a67
Signed-off-by: Roman Birg <romanbirg@gmail.com>
add lockscreen wallpaper to pin locksceen

Change-Id: I31528d5e5811385dbf480468eb266b4efd22a8f9
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Really add NavBar Hide feature this time.
It got squashed somehow in last set of commits.

Change-Id: Ifd5280f99a209078fbe967c031712ec7bddcce89
Signed-off-by: Mike Wilson <mwilson@acesappraisal.com>
Revert "Only turn off torch if it's on"

This reverts commit 6cce039354171ea978027281c0247b518c509905.
Bluetooth: added more music players for AVRCP1.3 support

Change-Id: I4c2f38a6a255e1a6fb4a595c5fde1425235bc968
This should patch things up...liquid try hitting the build button :D
frameworks/base: tilerendering with fbo boundaries

WARNING TESTED WORKING ON TUNA, i know some adreno chipset
phones do not like this commit. As we have added new moto devices
I have not checked to see the chipsets they use but Im pretty sure
all of our devices should be fine, OpenGlRenderer.cpp conflict
resolved easily.

1)tilerendering support when rendertarget switches
2)removed few rendering target switches to improve performance

Change-Id: I42c76e201537bd989631e11b0227ebcdc980f38b

Conflicts:
	libs/hwui/OpenGLRenderer.cpp
Merge "frameworks/base: tilerendering with fbo boundaries" into ics
Update NeilSmithline/resume.html
Fees Sheet fixed
Adding temporary stats page
Merge pull request #6 from ramielrowe/master

Temp Stats Page
tesst 2
implementing methods to get groups that are news sources, add a new group notice and remove an old one
Release 0.004
Translatin controller plugin & action helper
Fix MDP_BACKEND_COMPOSITION not found
Creato ufficialmente documento Risultati dei Test
Update shared to reflect currently available test devices
=== NOT ==
Merge branch 'master' into gh-pages
higher test limit
More 4.2 nonsense.
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: Id570895344c06ac297f526f395c95b232559dc67
Change system size back.. not sure i should have originally touched this.
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: Id6e898b935846b71983b52bdbd0642933c6a21f6
Update goo manager build number.
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: I1266d33689256ed439a3eaff326d6cd44ff4600c
Revert "More 4.2 nonsense."

This reverts commit a3a878bcffd38bab371ba1a8ef234f9fa496e9a8.
Change bluetooth to match cm
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: I923a9cec46bb0a997b760512045b714eb2e044e7
Merge branch 'mr1-staging' of git://github.com/scotthartbti/android_device_samsung_infuse4g into liquid-jb2

Conflicts:
	system.prop
Oops... need HTTP server, not HTTP client.
revert WPA_SUPPLICANT_VERSION to 0.6
Merge branch 'ics' of git://github.com/bluewater-cn/android_device_htc_espresso into ics
Clean up overall
set current_user as owner on activity copy.
[#26721033] The whole activity should have a single user

as per https://www.pivotaltracker.com/story/show/26721033
Merge branch 'experimenting'
Add link to GET /account/:accountName/activate doc
update README
Merge branch 'master' of https://github.com/ctctsupport/constantcontact-csharp-tutor
Added a class diagram to explain this mess :)
Slight change on link color.
Footer Integration
To select an item in a single selection list, clicking on the item no longer works.  Using Selenium's Select utility class instead.
Merge pull request #37 from rtomac/use_selenium_select_element_class

Fix select an item in a single selection list
Added 'Close All Browsers' to Suite Teardown in order to fix issue with test isolation issues causing following Acceptance.Windows test to fail.
Reset Selenium Timeout to default 5 seconds at end of async_javascript test suite.
Merge pull request #39 from emanlove/fix-waiting-acceptance-test

works for me :)
Merge pull request #38 from emanlove/fix-windows-acceptance-test

Fix issue with Acceptance.Windows test
- Added robotframework >= 2.6.3 dependency to setup.py install_requires
- Added ez_setup.py to bootstrap setuptools for anyone installing from source that might not already have setuptools installed (http://packages.python.org/an_example_pypi_project/setuptools.html#bootstrapping-setuptools)
- Updated documentation to reflect various recent changes (e.g. move to setuptools)
- Added section to INSTALL.rest for installing from PyPI (since it will be there so soon)
Documentation cleanup
Bump version to 1.0.0
Require robot version 2.6.3 exactly, not ready for 2.7 yet
- Fix doc and demo build that were still depending on metadata.py
- Consolidate version into one file
updated setup.py to automatically download setuptools if it doesn't exist so pip install will work from a clean environment
added README link to README.rst so setuputil doesn't complain
moved ez_setup.py under src so it will be packaged with setuptools / distutils
moved ez_setup.py under src so it will be packaged by distutils
removed adding the lib directory from MANIFEST.in
trying to get the tag to upload to github
updated authors in setup.py and readded version.py which I accidentally deleted
updaded BUILD.rst to document the process of publishing to PyPi
documentation of views:
achievements, splash, logoutview, login view and small changes in some other view
Site updated at 2012-07-04 23:40:01 UTC
Fix for #53 (allow user to override the MapperFactory)
Merge pull request #54 from bgooren/master

Allow user to override mapper factory (fix for #53)
added font awesome 
added text and chat style
added archive style
updated chromedriver url
Added good & great group classifying.
Stoped scheduling of deposited drivers after search expand.
added hover event and function so that help convention for datum fields doesn't appear when hover
Updated the version of jargon to target. Fixed some import formatting. Changed some logging over to the DEBUG level.
Made kibit suggested changes.
'users' table is now 'USERS'.
Site updated at 2012-11-29 11:27:14 UTC
Add WPCF7 CSS integration (optional) and ability to hide salesforce link at the bottom of the generated form.
Addig gitignore and some changes in db
Recommiting again after adding git ignore
Adding some files that were missing before
Add description meta field to Octopress generators
Add description to latest blog post
version 1 and 2 of regression.py changed
Testing with a different ico
Added delimitchars and hinting
mac os-related fix for part 3
Iniciando HTML
Remove version number from detect.
VSE Cleanup; added include for GPIB.h directory
refactor catalog item
for review
AdicionadoFuel
added Contact List file
Added CRC checksum code
Added CRC code
s/Nexus/Portal/
Added Utils.isScreenLarge to KEY_NAVIGATION_BAR
Modified CSS - added margin to toggled area
Merge branch 'master' of http://github.com/reubenmallaby/redmine_projects_accordion
talpin & jouvelot
working gyro and remote arm|disarm

path to toolchain
Added twitter widget to index.html
First implementation (+03:25)
Updated Proshop text
Extend authorization handling
Adds previous task as the default in the input dialog as per Celio's comment.
Omap compatibility from rowboat
account for a missing header
Updated documentation and code formatting to reflect PureMVC TypeScript framework.
Added a .gitignore file for Webstorm.
Added test libs (seems to have been forgotten for a while).
Updated build (only code formatting).
Added another triple RGB LED example project
Suppression de hooks
fix error and modify corresponding sentences
Localisation updates from http://translatewiki.net.

Change-Id: I1f21ca5416fa1898e75432c1480c4c3d478b6f33
Added fixes as mention by hameau

http://get-simple.info/forum/post/27913/#p27913
Merge pull request #1 from MarceI/master

define() in function and include() fixes
Site updated at 2012-06-14 18:22:02 UTC
Added support for displaying heroes mana as well as health
List requirements
New theme: charlies_angels
OmniShadowLightExample added
Update test cases for removal of zmq
Removed unused methods due to removal of zmq
Removed unneeded imports due to removal of zmq
Update notes for submitted changes

* Remove obsolete location/geocode settings
Remove old terminal lib
Uprava textu, jedna strana dolu. Uz jen popsat deduplikaci, warc, test warcsjohcve, zaver a je to vse
[images] new images for theme
missing symbol find_my_dev
Revert "MBM boots OMAP3630 with 800 MHz."

This reverts commit da296936b51d99cac0ad9cd5f2df73197df96122.
some decent progress
another twitter sample
pass variables from browse to checkout
final html
css file
Performance Settings!!!!!!!!

Patch set 7:  Moved PURGEABLE_ASSETS to main settings page
              Removed memory_management page and java file
              Compiles fine, currently untested

Patch set 8:  Added preliminary voltage control settings
              Compiles fine, currently testing

Patch set 9:  Fixed voltage settings FC
              Compiles fine, tested working

Patch set 10:  Removed warning dialog
               Removed memory_management.xml
               Cleaned up strings.xml
               Compiles fine, tested working

Patch set 11:  Cleaned up the code for future additions
               Compiles fine, tested working

Patch set 12:  changed icon, moved to system, added device hardware information
               note: needs accompanying build.prop edits. will push later.

Patch set 13:  Removed duplicate (kinda) string entry
               Removed more whitespaces
               Removed unused comments to clean up
               Removed the last of the ZRAM entries
               Cleaned up some code alignment

Patch set 14:  Rebased

Patch set 15:  Updated to match currently merged source
               Removed unused comment line in strings.xml

Patch set 16:  Removed Hardware Info for now
               Cleaned up a couple whitespaces

Patch set 17:  Small FC fix I just noticed entering About Phone

Change-Id: I52439c9c0e65dcccc6cb4834fcf91cf3cac43dee
Replace logs works on main dir now
Adapted apidoc XSLT to new documentation XML structure
Merge branch 'master', remote-tracking branch 'github/master'
changed the readme file extention to applay formatting
增加德问
Moved some openstack controller script to a later execution folder
remove calltime pass by reference for php 5.4 compat in class dgs agency
move config to seperate file, allow local override of github/cache
simplify generate.php; use the php system temp directory for better WAMP support
better sorting before generating, better local override for generating data files
better versioning of generator and APIs
fix for download filename, filesize, and contents pointing to non-existent file
fix for multiple values not properly storing due to HTML error in form
added links to readme changelog
added w00t to changelog
Install made easier. Removed bash scripts only used a single time to only let reusable scripts in the bin directory.
Leest nu het volledige bestand
Merge pull request #6 from dadoonet/master

Update maven assembly plugin version to 2.3
Added the ability to specify the amount of text to extract and index from an attachment.
update to 0.19.0
update readme
Fixed issue with setting of maxStringLength applying globally to the tika instance.

I have extended the Tika class to allow for setting of how much text to
extract from a document to be on a per call basis.
Merge branch 'master' of https://github.com/Henac/elasticsearch-mapper-attachments
change to _indexed_chars the parameter per doc, and add index.mapping.attachment.indexed_chars setting to globally change it (per index)
update readme
release 1.3.0
move to 1.4.0 snap
Add a fineName field to index the attchment fileName
rename fileName to name
upgrade to tika 1.1
release 1.4.0
move to 1.5.0 snap
add license and repo
Move test files in resources dir (bad practice)
add rfc959.txt and the expect library (https://github.com/BartMassey/expect)
Now there is a script for africa
changed repo structure to reflect book structure and renaming programs to reflect what is in the book
agregando behavior a front-end.css.less
changed yappi.SORTORDER_DESCENDING to yappi.SORTORDER_DESC
removed useless file
- License
- LICENSE file add
- .gitignore
Adicionando opcoes share no ultimo slide
make versionlib more robust with tests
correction mauvais sens "Java application servers"
changement de la tournure de phrase autour de la typo "coordinné"
typo automatisé/automatiser
correction intro fonctionnement liquidbase
fix typo heureusement
defaire -> faire un retour-arrière
"+appliqués" à une table existante
des données correspondantes
l'ensemble de changement => le changement
fix bag

déploiement/déploiements
ont l'aspect suivant/se présentent sous cette forme
supplanter/surcharger
easy/facile
solution/approche

qu'un exemple d'une solution possible
=>
exemple correspondant à une approche possible
pas de tous/pas sur tous

pour être plus cohérent par rapport au début de la phrase
des données perdues/les données perdues
liquibise/liquibase + changement tournure de phrase
typo est / et
re déployer / redéployer
Add Second Chance, MRU e NUR.
checking .ssh
Updated presentation with latest results.
@Miles removed example project which isn't ready yet
ReadMe.MD renamed to README.md.
Explicitly include Settings.System.HDD_TIMEOUT.
ENH: GUI adjustment.
changes data type for online_users table counters (bytes and packets)
Merge pull request #8 from dguerri/master

Fixes #7
Removed fragment intent
Started implementing private message view
adding .gitignore, rebuild_gitignore.php and root/socialnet/update_database_dev.php
removing UMIL
adding UMIL
Rewriting README.md
README.md fixes
Another README.md fixes
Fixing line intentions
adding git-tools, post-merge hook, fixing $phpbb_root_path to match hook path
adding instructions to git-tools/
Changing message after successful database update.
fixing post-merge hook stuff
fixing $phpbb_root_path
to test post-merge hook
to test post-merge hook
To tam nema co delat :D
Merge pull request #13 from Culprit-CZ/master

REMOVE config index
adding initial issue2pr.php
finalising issue2pr.php
Merge branch 'master' of github.com:phpBB-Social-Network/phpBB-Social-Network into develop
removing file_put_contents, updating $versions in update_database_dev.php
moved all assets to .php level and renamed the twig template folder to 'twig'
cleanup of previous commit
added keywords, some minor tweaks
1) Put the paginators in the right position instead of "align:left"
2) Changed the styles.css relatively
3) Modified one of the Company attributes "data" to "crunchbaseDoc"
added bundles config to local config fixes #4
added target cfm from ditc
Merge branch 'master' of github.com:stelligent/continuous_integration_example
Added component to create a google map of all active locations
Added flag -hd which you can append to downloader to download HD videos
QR backup with sample layout and database function
Initial Commit
Add facebook login view to the app view
Merge branch 'master' of github.com:toddlee/iOS-rails-omniauth-facebook-login
README.md
Revert " Disable get ipv6 adress"

This reverts commit df0165e49055f8a8caf5f2583ae6e0f7730cab54.
Update DefyParts/res/values-pt/strings.xml

Add PT-BR New Strings for Button Brightness

Update for Portuguese translations
fix audio routing in dock modes
Add backup TLS registers for allow rmmod module
update tls module binary
some fixes for camera
disable the wifi signal poll

Change-Id: I1adccd3a80f7e6cbe07845097caf422f19f2a2ff
reduce changes in wifi tether

Change-Id: If386ca25a230d342ce3c3839101c1cf142d47f12
Change Task to use string for url instead of NormalisedUrl
Localisation updates from http://translatewiki.net.

Change-Id: Icffa1fe68e41d41707b41162bc13eb448684dedb
Rebase from 'release/ecl_navigation_apps' @ version '0.50.2'
Generated debian files for precise
Now checking if the password already exists.
Aclmanager added, action to rewrite acos.
Merge remote-tracking branch 'github/master'
ajout d'une page d'exemple pour le blog LT
Fixed some dimensions.
Site updated at 2012-05-31 06:16:08 UTC
Site updated at 2012-05-31 06:19:46 UTC
Add option to enable/disable hybrid mode
- change to normal phone mode with just 1 click + reboot
- hot reboot option implemented (quick reboot)

Change-Id: I015cb3e52b241f0c476cc2e68ee2df7f87593708
clean up blobs that can be built
speed funtion logik
src/com/android/settings/wifi/AdvancedWifiSettings.java
Add into setting toggle for Wi-Fi speed on sleep
Adds icon, adds discrete menu logic.

Adds image of icon to imageindex.properties. Seperates menu logic into MenuUtility 
and MenuType out of GameCanvas.
Update Adafruit_CharLCD/Adafruit_CharLCD.py

In delayMicroseconds(), sleep(seconds) always equals 0 (get a lot of weird characters on LCD)

in python v2 microseconds / 1000000 = 0
changed to : microseconds / float(1000000)

so sleep(seconds) doesn't always equal 0 (get a lot of weird characters on LCD otherwise)
Merge pull request #13 from rogg/patch-1

Update Adafruit_CharLCD/Adafruit_CharLCD.py - Weird Characters
add(user_specs)
add(user_specs_changed)
Prueba de tablas
Prueba de tablas
Added more mac eclipse short cuts

EditorDuplicate, GotoLine, NextTab, PreviousTab, RenameElement,
ShowUsage
changed install script to use the local file 'Eclipse on Mac.xml'
Added negative unit tests for widget id
updating and reformatting code
Deleted David/Ramon comments
第一章习题1
Pluralizes report dir name
Choosing neighborlists correctly
Set default local and checked for valid SDK

Changed locale to default to user locale if possible.
Added check to see fi directory is valid Flex SDK directory and if
directory has not already been packaged.
Fixed order of initialisation.
checked in main style.css file but may revert it back
Bugfix: now renamed files are no longer marked as conflicting versions
Attempt two to fix bug with too many files marked as unversioned.
The max uploade size of the Dropbox API is 150MB
Default store in subfolder to false
Add slashes to exclude widget js
Changed the backup dir to an abs path
Exclude contents of backups and uplaod the sql dump manually
Copy tweak
Lowered the access level to equal activation of plugins
adding Java Configuration samples
fixing POM so it Unit Tests be run from the command line
adding Java configuration for jpa
remove unwanted apps from build

Change-Id: I909ba5bd2ff7031311d933fb2ba30ea3fb5a42fb
Updated Tue Sep  4 00:07:08 PDT 2012.
remove modes and partial testing
add missing pipeline functions
レイアウト微調整のみ
Site updated at 2012-06-01 20:30:52 UTC
Revert "First sable version"

This reverts commit dfaa27499ceb63e15005140dce166e9f6c4ce579.
Revert "Revert "First sable version""

This reverts commit ab5b5abc3aeecbf9aa8c0bd5118aa08ea85cd5ed.
plunit installation readme added
unicorn, thin, and shotgun gem info added
Almost have CheckersBoard.cpp compiling.
added νῦν
added entry ἀδηλότης
Added releases directory and fixed markup of sense numbers
	modified:   abbott-smith.tei.xml
	new file:   releases/.directory
	new file:   releases/abbott-smith.css
	new file:   releases/abbott-smith.pl
Merge branch 'master' of https://github.com/translatable-exegetical-tools/Abbott-Smith
Localisation updates from http://translatewiki.net.

Change-Id: Ib1c4381950a44321ac8a34afba8ed696158d6a3a
galaxys2: has noise suppression

Change-Id: I6dcce2adeae95304a135af35e7adb132ff6eae08
Triangle output
Changed all buttons to be black cool buttons
reset IR_DATA_READY state after reading the data
BACKLOG-450 Link opensocial's groups to a group service.
Captcha/en_questions.txt has one question
Made the window smaller
solucionar problema al hacer rake db migrate
Implementation of blackberry.io.filetransfer.download()
Rearrange functions
filetransfer.download() Added dialog for certificate confirmation
openDialog shared function
Fixed compile
openDialog function returns CURLCode
Added whitelisting for filetransfer upload/download
Added FileTransferError http_status code for download
Fix BBM automatic unit test to pass on the first time with latest changes

Fixes blackberry/BB10-WebWorks-Framework#365
Fixed unit tests - only define chrome.internal.navigator.* if not in node
Modifying the window-webworks file to make sure the webworksready event is not fired before the domcontent is loaded and a listener is ready
Merge branch 'next' into next-app-api
Fixed unit tests, added functional test
add comment linking to spasm
Update webCrawlerMangaReader.py

Code formating
bug in settings link
fixed issue of jquery variable scope
初始化导入代码

0.4.0.1