labofsahil/github-event-dataset-2012 huggingface dataset:
Checkstyle errors were fixed for all new checks that were written.
Merge pull request #25 from daniilyar/master

Checkstyle errors was resolved. RI: applied
added new kernel, getting ready to abandon and start from scratch.
Snapshot version of digitv ingester that works
Logging per file working
Proper handling of the odd components
Log major events on INFO level
cleanup in dependency management
be readable & change logic
Added WP-PageNavi compatibility.
changed Chinese location names from all caps to lower case
Temporarily comment this out until we get the reset implemented
Updates to SurfaceFlinger
new cfengine_stdlib.cf + comsmetique sshd_config_simple.cf + ajout test_conf_sysctl.cf qui est fonctionnel
Uploaded Files from 6.10 Github version

Transferred the files from 6.10
Trimmed the ObjectSerializer interface down to reduce generated boilerplate
Added an annotation: @DontSerializeClass

this will prevent the class from being serialized into the JSON.
Added ability to skip class serialization with arrays
Fixed issue with deserializing subclassed types.
Changes to make simpler generated API compatible with existing code.
- Firefox support (works out of box on file:/// urls)
- Error handling in client
fixed bug - accidently overridden a method in IQTag
roster - fixed ui bug
Localisation updates from http://translatewiki.net.

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

Change-Id: I0d1e10afd0269a69b8441191d168ee89fa579610
project5 init
Done
Minor changes - return AnchorType enum from Html string.
WLWPostContentHelper: Removed methods refactored out to EditorContentClass
LinkBuilder: Removed stripLinkHtml method. Already defined on WLWPostContentHelper class
Moved Regex extraction operations to more appropriate locations. Eliminated
all dependencies upon WLWPostContentHelper.
Deleted WLWSimpleAnchorManager after refactoring.
AnchorData class - Cleanup only.
Cleanup Only
CreateContentForm - Renaming and adjustment of UI element locations
Whitespace and comment adjustment only
Incorporate refactorings into project file
Added new Main form base - EditContentForm with basic controls - no function yet.
Added default constructors to Panel Controls for designer
EditContentForm - Completed core design and function - Consolidated code in main .cs file.
EditContentForm - Removed partial Class file after consolidation into primary
CreateContentForm - Disabled by Commenting out Code
Project File reflects removal of designer file for EditContentForm
InLineAnchorManager Class Modified to use new EditContentForm
Added Project Settings for Global Setting values
Added ExtendedTextbox Class for "Modern UI" style emulation
EditContentForm
pnlAnchorEditor
pnlAnchorEditorBase
pnlLinkEditor

All modified to use Application Settings and ExtendedTextbox.
Rebase from 'release/ecl_devices' @ version '0.50.2'
Generated debian files for oneiric
更新rhino版本到1.7R4，更新CoffeeScript Compiler v1.3.3
lib/sha1: use the git implementation of SHA-1

For ChromiumOS, we use SHA-1 to verify the integrity of the root
filesystem.  The speed of the kernel sha-1 implementation has a major
impact on our boot performance.

To improve boot performance, we investigated using the heavily optimized
sha-1 implementation used in git.  With the git sha-1 implementation, we
see a 11.7% improvement in boot time.

10 reboots, remove slowest/fastest.

Before:

  Mean: 6.58 seconds Stdev: 0.14

After (with git sha-1, this patch):

  Mean: 5.89 seconds Stdev: 0.07

The other cool thing about the git SHA-1 implementation is that it only
needs 64 bytes of stack for the workspace while the original kernel
implementation needed 320 bytes.

Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Cc: Nicolas Pitre <nico@cam.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David S. Miller <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: 2fast4u88 <bk95ta391@gmail.com>
drivers-video: Fix Section Mismatch

Signed-off-by: AdiPat <adithemagnificent@gmail.com>
drivers-usb: Fix another section mismatch

Signed-off-by: AdiPat <adithemagnificent@gmail.com>
Fix a reference to is_sticky.
omnistereo cleaning
Merge branch 'master' of github.com:AlloSphere-Research-Group/AlloSystem
aktualisierungen
dfiasdfi
Add proposals as a resource in ActiveAdmin
Require proposals to have a name
Update to ITK 4.1
ville: add support for qrngd

Change-Id: I23a0e9acc67f496695faa049baab5b0807962d74
Update notes for submitted changes

* mint: fix storage overlay
[maven-release-plugin] prepare release jackson-module-afterburner-2.1.0
kgview: Automatische Aktualisierung fuer ArchivKG

Jetzt kann ein Zeitintervall konfiguriert werden in dem die Archiv-KG
Ansicht aktualisiert werden soll, falls automatische Aktualisierung mit
dem passenden Button in der View aktiviert ist.
kgview: Ordnungszahl pro Fav.Medikament ausblendbar machen

Sie wird zwar immernoch als Vorlage benutzt fuer die Verschreibung, wird
aber in der FM-Liste und im Dialog nicht mehr angezeigt. Wurde so
gewuenscht.
kgview: Konsistenzpruefung fuer Fav.Medi.Liste

Nach einer Aktualisierung des Medistamms sind viele Eintraege in der FML
nicht mehr richtig verknuepft. Diese Funktion prueft die Liste, und
versucht allenfalls Medis anhand vom Pharmacode neu zu verknuepfen,
falls moeglich.
kgview: Zweck pro Verschreibung anpassbar machen

Damit kann das Zweckfeld beim Anlegen einer Verschreibung angepasst
werden.
mvn pom location added
fixed the paths so the files don't need to be changed from machine to machine.
The fix will work so long as the relative positons of files doesn't change.
table new design
own page submit by enter
Routes and updated to = form_for
fix axess link
Renamed the 'id' to 'tag' in the filter.js and get-filters AJAX action
Removed empty naptan.json
Marked some imports as optional to work around BAMSON-81
Removed unnecessary spaces at line ends
Fixed TARGET variable name and added output.
EOD 22/05/12
Pull config.options.example via absolute path as well
HTML-72: modified the getValue method for autocompletes so that it fetches the underlying value (ie, id) instead of the display value (ie, provider name)
HTML-337: Enable javascript id tag on the relationship tag
Added application screen-shoots
Merge branch 'ics' of git://github.com/CyanogenMod/android_frameworks_base into ics-miui
add lte/gsm mode
Fixed Hungarian keyboard layout derp

Change-Id: I128ed9813fe0008f0f50ff1d23e22a2c5e7b72b7
Merge "Fixed Hungarian keyboard layout derp" into jellybean
settings: add missing @hide's

Change-Id: Ic67c0e151e84dbcadf5382a765ffd5c2a18483da
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_frameworks_base into jellybean
require JSON
Exportfunktion für altes Skript
even urls.py removed from tracking
bgcolor option removed from nicEdit
Remove unneded var
Time to get this junker booting to fix some APN issues
Version for QA… starbucks
corrected Review on Formal Methods Technology Transfer Will Fail page.
Ajout des pouvoirs de la force, et diverses corrections sur l'arsenal
Added disabled state for game widgets
Moved images folder

Moved images folder to same directory as index.jsp in order to simplity
and use relative paths...
Added ./membersManage functionality thanks to MaxOfS2D
remove module namespacing
added webite info
Make sure the MANIFEST.in file is always included
Updated DSpace export sample so it is not configured in directories
Add skeleton for ActiveSync fakeserver
Add basics for ActiveSync fake server
Use MessageGenerator to make messages
Improve ActiveSync fake server sync key logic
Automatically list the supported commands in our ActiveSync fake server
Support ItemOperations in the ActiveSync fake server
Merge branch 'master' into activesync-tests
Move ActiveSync fake server to a separate file
Use generic message generator for ActiveSync fake server
Add better support for multiple folders for ActiveSync fake server
Fix whitespace
Add some comments to the ActiveSync fake server
Fix WBXML encoding in the fake server
[activesync/fakeserver] Fix the ItemOperations command
[activesync/fakeserver] Use the port defined in the makefile
[activesync/fakeserver] Allow overriding the ActiveSync fake server port
[activesync/fakeserver] Checkpoint unit tests
[activesync/fakeserver] Add a (working!) unit test for ActiveSync (just creates an account for now; requires you to run `make activesync-server` in the background)
[activesync/fakeserver] Fix test comments
Remove Ci, Cc, and Cu
modify page about
Move screenshot to assets folder.
Deactivate if running WordPress 3.5+
English Javadoc.
Start english javadoc.
Lemmas 2 and 3
Fixed python article.
Tweaks lower default volume to avoid distortion

Change-Id: I66d9b3881a84e0cd6b7e843d735389c6104bb5fe
Update Kernel

Change-Id: I4cc5538327ac421b4bb943b6ef95c550f6ada7ed
check for NULL logs config
Fixed duplication checking for own data record
#012 create blog-todos view

HTML Jekyll and CSS done. It is imilar to blog category views, can't
implement pages in a simple way (github limitation with jekyll) so for
the moment is a long grid of articles
tweak foreman sentence
slight renaming to be inline with other extensions
[maven-release-plugin] prepare release context-mgmt-annotation-1.0
Basic hcard implementation
Update README.md
Merge pull request #2 from andichirita/patch-1

Update README.md
MemHandle      0.07
Debug::ShowStuff      1.13
Data::Taxi      0.96
PHP::Serialization      0.34
FreezeThaw      0.5001
Data::Serializer      0.59
Bencode      1.4
Convert::Bencode      1.03
Convert::Bencode_XS      0.06
Data::Denter      0.15
JSON::Syck      0.43
XML::Dumper      0.81
URI::Find      20111103
Catalyst::Action::REST      0.99
Catalyst::Manual      5.9003
Catalyst::Action::RenderView      0.16
Catalyst::Plugin::ConfigLoader      0.30
Catalyst::Plugin::Static::Simple      0.29
MooseX::SemiAffordanceAccessor      0.09
File::ChangeNotify      0.21
Commit 3 - Photo Uploads, XML Feed, Tests, User Authentication and Pagination
Use minified bootstrap css and minified style.css. Both versions included
2.0 release
Initial upload of Bones
2.0 release
Added some ";" to get it run in german mobile networks when all files are imported into one file.
+ bug fix for oa-cache forget actions
SWITCHYARD-1069: Separate picketlink from core security classes
Correctly use $wpdb->prepare
Fixed pagination and styles h3 headers
system prop: revert back to htcqualcommril, and add ro.telephony.ril.v3=sprintLteOnCdma flag

Change-Id: I63bd147cc272152cce083355f916ba070009eb31
ville: remove unused libsensors
ville: revert prebuilt libril

Using prebuilt RIL libraries causes rild to crash.

Revert "ville: don't use prebuilt libril (2/2)"

This reverts commit 5ac3f0f5e4b5b68bcb5e1633fe5318a2a0b9f30e.

Revert "ville: don't use prebuilt libril"

This reverts commit c81c3001a1fb153d4b0196062fc7dc3ae2904557.
ville: re-sort init script

Re-sort init commands according to the trigger they originally were at.

Conflicts:
	ramdisk/init.ville.rc
ville: current init.rc doesn't create /cache
ville: merge firmware partition wait lines
ville: disable run of qcom-post-boot.sh

qmuxd, netmgrd, and ril-daemon services are started as part of the init
class main.
ville: start system services as class main

Jellybean init doesn't seem to start these services unless they were
defined with a class, or otherwise started through properties.
ville: remove prebuilt init
Load initial products
Fixed up DemandNodeViewModelTest to complete to point written.  Added clean-up code both as a demo of how to delete a run from the DB, as well as cleaning up after a test is run.
TC SRM525
Added view controller for upgrading to full version. need to implement app checks
Working with location bug
Merge remote-tracking branch 'origin/master'
Fixed banner ads bug
Fix highlight block issue
Corrected Built-in Observer timestamps example in README
Merge pull request #43 from tonydew/master

Correction for Built-in Observer timestamps example in README
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.2.1-43.43~ci~20120608002148 vexpress only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.3.1-31.31~ci~20120413001818 vexpress only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
Merge branch 'latest-sauce-branch' into working-branch
LINARO: CI: Start new release
LINARO: Update configs
linux-linaro 3.4.1-3.3~ci~20120604002216
        created from:
        tree:git://git.linaro.org/kernel/linux-linaro-tracking.git
        branch:linux-linaro
        commit:6ba32bb59015878eff51c3aca1efae959bc2ae8f

packaged-kernel-branch-commit-hash=6ba32bb59015878eff51c3aca1efae959bc2ae8f
commit 6ba32bb59015878eff51c3aca1efae959bc2ae8f
Merge: 3f30472 774c3a2
Author: Andrey Konovalov <andrey.konovalov@linaro.org>
Date:   Tue May 22 20:39:37 2012 +0400

    Merge branch 'rebase-last-minute-fixes' into merge-linux-linaro

Signed-off-by: Linaro CI <john.rigby@linaro.org>
Use open3 instead of open4 in lib/proc_nonblock.rb
Revert "convert to bcmdhd"

This reverts commit 1085186f73d3c6dc519ee9585e1105ddcfa856eb.
Added initial alpha-version. This has only been tested on a small subset of my users, so don't rely on it for production yet!
A bug fix
Merge branch 'master' into r1.0

Conflicts:
	f1.txt
Merge branch 'r2.0' and 'r1.0'

Conflicts:
	f1.txt
added a null check for json objects
add node.jpg
Correcting function name to get file by hash
Merge pull request #3 from kanikagoyal/correcting_function_to_get_hash

Correcting function name to get file by hash
adjust pendingintent. I am monitoring the widget...
update virsion
disable debug log
fix the crash bug network errors raise
fix sleep on / off receiver bug
fix the failure of opening browser on clicking
update version
Removing all references to touch recovery
- Improved performance of js and simplified the code.
- Removed console log.
- Added margin top to details section.
Fixes in many bib items
Many changes; too many to mention
Versions upgraded
auto-20120329221701595405657
auto-20120322231702736753231
Merge pull request #1 from maesenka/master

Updated microbenching tests to current version of geom
added active record
added readme
mysql addapter settings
mysql addapter settings
insert data in database
Addition of feature to disconnect from OBD port on failure, and reconnect only on new incoming subscriptions
inserimento e rimozione date da viste (amministratore)
Adding back jtwp.php
Added VBO support to MyQGLWidget.

MyQGLWidget now inherits from QGLFunctions as well as QGLWidget. This
allows for GL extension methods to be used; I wanted it for VBO support.
Hacked in a quick drawing of a rectangle using vertex/index buffers.
Changes in SaoPablo
Merge pull request #92 from aleml86/master

Sao Pablo Page Markup
Update master
Merge pull request #25 from Gerk/master

Change YouPorn repo
no margins on .slideNav
merge
Add support for a per-account synchronization range for messages
Merge pull request #52 from mozsquib/as-filters

Add support for a per-account synchronization range for messages
Add map module. At the moment it is in testing.
updates to basic html.tpl.php
Site updated at 2012-08-10 18:07:54 UTC
Added cufon font replacement and fixed some nav bugs in ie8.
add EAP 6 support
some changes for EAP6
detail atelier go
Test portfolio images
Adjustments to menu and content spacing on home page.
adding charset to media
neil carlson
Added wildcards to fetch all jars from a directory.
パッケージ移動
add excludes
set safe to false for jekyll highlighting!
Добавлены презентации по РБД
Added link to home device in CMS. Re-styled social links
code separated into separate files
Fixed template url to be compatible with Django 1.5 url template tag
Site updated at 2012-12-07 15:26:25 UTC
changed version in paid-memberships-pro.php comment to 1.5.2.999. Trying to find a way to make sure people who install the DEV version will still be notified ofthe next update when it hits the WP repo. So we won't update this to 1.5.3 until we push that to the WP repo.
change in ccs by akash
Merge branch 'master' of github.com:swapnilvathare/webo_freshers_project
メモリの使用量を追加
Modified PX_PROTO_* defines to match those of android
reworking exception handling and finally shutdown
Fixes bug with non alphanumerical characters not being escaped in distinguishedName
Use picocontainer to inject web connector (selenium client)
moved php implementation to obsolete_php branch
master now holds python3 implementation
Set hard ref from Web proj to translators for now to avoid hard-coding path names, other small changes
Refactored GherkinFormatter slightly

- Extract column width calculation into its own method
- Use a buffer instead of string concatenation for performance
Wrapping up development; renaming files to normal names.
Wrapping up the rename.
path
repair U test
tests of Quynh
invoice
Removed count by entity type
- added a normalize action
woops forgot to feed hotpolug the neccesary info. Disable it as default for now as w/ kexec only one core works
ShopCircle 1.5

Fixed that crashing issues when we clicking Back button in middle of
web services loading for displaying images.
AdMob Mediation Demo
Merge branch 'master' of github.com:AppLovin/AppLovin-Android-SDK-DemoApp
added Google+ API
Fix issue #14
remove extra spaces
Merge
Change to be compatible with 2.2-m2
Based on research from Pavel, removing the @ in front of handleError()
Site updated at 2012-10-25 11:38:16 UTC
update crespo4g Sprint apk binaries for 4.0.4

Change-Id: I70dca11dbd52d380794a802188ef5784f2b232ce
zeusc: removed unused files
Update notes for submitted changes

* lotus: kernel and rd address override
Update notes for submitted changes

* Optimize MFC memory usage, properly - There are several bugs in MFC memory management that needs to be   fixed for non-equal buffer size to work properly. - Samsung originally reduced CPB_BUF_SIZE, but it causes mis-decoding   of some videos. So we increase it back and also slightly increase   the memory allocation to support it. - Userspace mmap size needs to be changed to 35328*1024   (port0_size - firmware_size + port1_size)
Update notes for submitted changes

* Mms: updated Czech translation
Fix cursor repeatedly moving back to beginning of To field

Change-Id: I4e9a6ed0add746d82eb3f50332fc1dd26bc38504
http://code.google.com/p/cyanogenmod/issues/detail?id=4068
Fixed the broken comment box and reset fields after create new Happenin.
Merge branch 'master' of https://github.com/EscapeCharacters/whats-happenin-cs330

Conflicts:
	edu.csbsju.whats-happenin-cs330/bin/classes/edu/csbsju/whats/happenin/ViewHappenins.class
Methods for media type

Add methods to return media type and format
Constants for media paths

Add constants to the Media class for storing media paths and dimensions
Calculate paths

Add method to calculate path for a given size from the media_root and media_paths class variables
Calculate path

Add #media_url method to calculate path for a given size from media_path and the filename
Convert strings to symbols in call to Media#dimensions
Calculate dimensions

Add #dimensions method to return image dimensions, either full size or calculated according to a ration specified in the media_dimensions class variable.
Add all sizes to Media resource
fix for textfont changes
created parallaxy subtheme
Vorbereitung Release 1.0.0
Add logfile
hotfix Ver --> Vor
Merge remote-tracking branch 'origin/hotfixes'

Merge hotfix ins master
BUG: ApplyCosImageFilter was using sine.

Suggested-by: Bill Lorensen <bill.lorensen@gmail.com>
Merge branch 'SinCos'
updateSubscription() was failing because it wasn't sending the planid along with the request. Updated so planid is sent with the request.
Attempt to ensure the menu appears on auto-backup fail

If the md5sums cannot be verified, do not reboot, but
instead show the menu and allow user to proceed
manually, with a warning about the failure.

Change-Id: Ie09f4bf8fa5909a51a3c25204affc1490996be59
Removed a hard coded div clear both as it caused problems on some sites. Such style information should be in css and not hard coded in templates.
Merge branch 'master' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study
Fixed values up.
msm: holiday: disable timpani
NuSpec complete and install script changes namespace
Bluetooth MAP (Message Access Profile) Upstream Changes (2/3)

Incorporates updates to the Bluetooth MAP profile from Code Aurora's
Android Enablement Project since we initially pulled in from their
gingerbread to CM7 last year. This patch addresses bugs with the
current MAP profile, adds a UI request for message access approval
when pairing, and adds additional error checking and logging.
Confirmed to fix date and "Download" function of Ford SYNC Gen1.
Pulled in from the codeaurora jb branch.

Change-Id: Ie35067f389ced8e86433a991776b4a8e1f1ce963
Update Japanese translation.

 - Add missing translated entries.

Change-Id: I4e4f36b5c77aeaa328fa2eb08e462202a52c6267
Settings: Update Greek translations

Patch set 2: fix tabs & remove accidentaly duplicate line

Patch set 3: update forgotten string

Change-Id: I0e4f6ab0766b0cb7bea267bc8f8ca3e84614ada0
German: Stylus gestures

Change-Id: Ia96963121745dc10f7d2ce9d6b064b56d8125c9a
Remove duplicate translation

Change-Id: Ibab1660520a0076e6da07381e028b2e42ab9b152
Merge branch 'jellybean' into MiniCM10
Fix to Issue #33 - pushing the verbose ImmutableBy...
FixBug: Cannot convert @constant, if the tag is one liner
call function on window based on its URI in addition to its type; overlay toolbarbuttons
changed version to 1.1 for release
Added mem leak test with resources
opmerking
db inloggen bij agenda aangepast, link in home

link is voor gemakzuch
added AddCommentOnUrl
set up composer.json file
work in progress notice
removed deps
removed comma
some dev...
cleaned up docs
return null if no entity found
added first draft of docs
removed deps on Annotation parsing
doctrine orm docs added
leftover from Entity refactorings
Merge branch 'master' of github.com:AdrianSchneider/SyndMultiTenantBundle
only use multi-tenant repo when valid tenant is passed
whitespace
criteria tenant should be the id not the entity
added doctrine event listener tag
no need for dealing with uow for creation
only set tenant once
works now, removed warning
Updated NuSpec to refer to blog instead of GitHub
Updated to MicroLite 2.1.0
add missing download dialog string
added test of return of strtod() to better test for non-numeric strings
commit mo file
PRODUCT_MAKEFILES: device.mk -> cm.mk
move lcd_density back out of common tree
bring ril inline with i9100/n7000
fix dependencies
added 2 share icons - need lil enhansement
update now gets time delta
delete edited again
HTML5 Navigator documentation
add documentation for online and offline events
BB60+ tag has been added
remove the constructor
Merge pull request #137 from blackberry-webworks/html5-Navigator

Html5 navigator
Updated docs for blackberry.pim.calendar
Preferences: initial Preferences Activity, Provider and XML

Change-Id: I27d44993c4e34e08cfafff6d7a418df7c4f06fd2

Conflicts:

	AndroidManifest.xml
	res/values/strings.xml

Conflicts:

	AndroidManifest.xml
Preferences: Hide search bar preference + others

- Restart Launcher on preferences changed
- Implement "getCurrentOrientation()"

Change-Id: I0728824ab994984c1dc798b61efa26b727ca3ea2

Conflicts:

	src/com/android/launcher2/Launcher.java
	src/com/android/launcher2/SearchDropTargetBar.java
	src/com/android/launcher2/Workspace.java

Conflicts:

	src/com/android/launcher2/Launcher.java
	src/com/android/launcher2/Workspace.java
Preferences: Auto-rotate screen

Change-Id: I126b57932bad994c3fcfa3c764d94bdb60037a93

Conflicts:

	src/com/android/launcher2/Launcher.java
Conflicts:

	src/com/android/launcher2/Launcher.java
Preferences: NumberPickerPreference

Change-Id: I1888fe530a71af1e5d3b015d4a416c98e20ee3e0

Conflicts:

	res/values/attrs.xml
Preferences: Number of Homescreens + Default Screen

Change-Id: Id361d71c9fd0f0748fa6a48c6702178d366221b8

Conflicts:

	res/layout-land/launcher.xml
	res/layout-port/launcher.xml
	res/layout-sw600dp/workspace.xml

Conflicts:

	res/layout-land/launcher.xml
	res/layout-port/launcher.xml
	res/layout-sw720dp/workspace.xml
	src/com/android/launcher2/InstallShortcutReceiver.java
	src/com/android/launcher2/Workspace.java

Conflicts:

	src/com/android/launcher2/LauncherModel.java
menu formatting
NumberPickerPreference: Fix possible NPE

Change-Id: I0dc999b8a782a2a4038aecbfc450b007f0272126

Conflicts:

	src/com/android/launcher2/preference/NumberPickerPreference.java
Preferences: Show Dock Divider

Change-Id: I5e4349e5b7539a66d5d96c5f9fd9780b7572d624

Conflicts:

	res/values/strings.xml
	res/xml/preferences.xml
	src/com/android/launcher2/Launcher.java
	src/com/android/launcher2/Workspace.java
	src/com/android/launcher2/preference/PreferencesProvider.java
Conflicts:

	src/com/android/launcher2/Launcher.java
	src/com/android/launcher2/Workspace.java
move launcher preferences up one in menu
Fix shortcut intent when using less than 3 homescreens

This patch fixes issue 6192 as outlined at the URL below:
http://code.google.com/p/cyanogenmod/issues/detail?id=6192

To reproduce the issue set the number of home screens to 2 or less and try to add a shortcut as follows:
- open "People" application
- select a contact
- using context menu, choose "Place on Home screen"
- go to home screen to see crash

Change-Id: Ib1c7f6b1cf5055714b4d9e57c637c8a7fa05e9d8
Final fixes using the PHP Coding Standards Fixer

taken to PSR-2 standard
see: http://cs.sensiolabs.org/
bug css JQueryMobile
just copy icons.
CSession : same for all domains if domain is specified
support counter cache
Add stage-specific override functionality
change none to blank
Updated to include news section, layout reworked and info added
Update webroot/js/invoke.fancybox.js
Map now centers to user location
15th Update
update
update
update
qsd8k-common: Include make_ext4fs

Change-Id: I6e70ca5ca38e3d6cd7471771468f4191e3c7a927
Merge branch 'jellybean' of git://github.com/Evervolv/android_device_htc_qsd8k-common into jellybean
Update 5.3.x(cherry picked from commit 46223f23bf93cb3f34fa03388f4a942a0e49bb58)
GUVNOR-1861 Upgrade to weld 1.1.6.Final (the same used as in JBoss AS 7.1) and upgrade to a compatible solder version (3.1.1.Final)
fixed 'Last Updated: (null)' string display
mesona: mdp composition (CAF)
Revert "updated image"

This reverts commit 0df4dcb10bc92a45547aedcaf3fa48f1d0752eb2.
Use cache file modified time to request github api
Upgrade to swingxbuilder 0.3
Part 2 Skeleton
switched nav parts
setting base uri
processing lists
jquery-ui enqueueing
forcing populating of level2nav if we are displaying a research project
removed uniqueness validation for print_code
Change human handling of poop collisions
Readme update for formatting and readability
init basic start of phonegap app
[JENKINS-15197] Add support for Maven toolchains config files
Fix bad Heiders on olamy request
Merge pull request #3 from jeffmaury/JENKINS-15197

[JENKINS-15197] Add support for Maven toolchains config files
Thanks !
[FIXED JENKINS-13114] dropdown views taskbar: error when saving jenkins config page
Fix undefined constant Gem::Indexer

It still fails in regards to the `builder` gem missing. I believe I'll
need to figure out a way to package it with the buildpack itself.
Fixed windows service
Corrected the problem with resolving optional artifacts.
Update packages/sample_content_generator/controllers/dashboard/generate_install_data.php

You can generate data for content.xml that can be used at the install.
adds ngerman to german tests and comment in thesis.tex
adds setting of counter to start at 1 after coverpage
adds prefix for non public defined commands. fixes #6
Fix variable names shadowing module names, missing module qualifier
Merge pull request #16 from leo-naeka/master

Failing with embedded documents' embedded lists
Merge pull request #17 from aparajita/var-name-fix

Fix variable names shadowing module names, missing module qualifier
Renamed imports a bit.
In a bit different way.
ApiFieldError is in tastypie.exceptions
Merge pull request #18 from aparajita/exception-fix

ApiFieldError is in tastypie.exceptions
Check for nested resources which are currently not supported.
Field auto-allocation in save() test case
Fixed ApiFieldError text: match the on in test_basic.py
Moved mongoengine's validation error handling in obj_create() and obj_update().
char
Merge branch 'master' of github.com:loicknuchel/democrazy-hacktheelection
Clean up auto hide and fullscreen for consistency

Change-Id: I78ab05c22c6c5688fc424748d6c0423c21e4cc27
Merge remote-tracking branch 'origin/jellybean' into jb-sgt7-linaro
Expanded the level

Added more zombies & platforms
Everyone prefers HD.
Test files for issue 2 fix
refactoring closure helpers
algunos bugs corregidos
Added a new gemspec to work around a bundler issue in allowing two different versions of the same dependency across different platforms.
patientsummary: Follow-up commit to PS-1 to move Privilege and
Configuration utilities into separate classes, and to focus the methods
more around Patient Summary rather than Report Design
Added derivings
NXP-9831: specify at node level the taskType to be used
Moved gemfile to proper place
Restriction of location list by currently logged in user
Added hasLocationPrivilege method to check if a privilege already exists
Merge pull request #21 from ojwanganto/REPORTS-37

Reports 37
Merge
Reverted untracked files
TogglePanel Added
added also ns1/2/3 with new denise
removed a deprecated dependency, and cleaned up the output file such that all new listings are now at the top of the html, rather than the bottom.
p4vzw: add in 3.1 kernel and associated changes

-change wlan interface
-amend props (also add in widevine drm)
-change tty interface and ril
-enable radio/lteOnCdmaDevice, voice_capable and recents_interface_for_table
-add mms and apns (from stock ics; reference toro)
-remove libarccamera, libseccamera_jni and libseccameracore
-add gps.conf (from stock ics) and my.gps

-also merge in:
 https://github.com/pershoot/android_device_samsung_p4vzw/commit/04d7e434d828d2e507ef1af2092fda2bfc8c9e99

-remove sec_keyboard
Fixed Install Bug

The install function was using the wrong edd_setup_download_post_type() function.
Fixed function spelling error for #547
Removed the old file download links from the success page. #495
Added edd_remove_download_logs_on_delete() for removing related log entries when deleting a download
fixed true prob caculation ... known bugs
* Initial version of doctrine CRUD wrapper for codeigniter.
Major reorganization of code.

Moved all routes out of app.js into their appropriate controllers.
Implemented resourceful routing.
Fixed incorrect license acceptance string literal - again.
Manager server - first commit
add git ignore
Merge branch 'master' of github.com:robbflynn/soundsharing-manager-server
working ros graph as gateway graph.
learning mongoose is hard right now
Signed-off-by: unknown <AIDAN@AIDAN-PC.(none)>
Linux 3.0.48
 Linux 3.0.48
forked from v3.2-staging from arago for calixto boards still will go through changes this week
Merge https://github.com/smartpathinfosystemsindia/linux-am33x
files
Updated default language files.
Merge branch 'master' of https://github.com/pippinsplugins/Easy-Digital-Downloads
Update includes/admin-notices.php

Restricted EDD admin notices to the edit.php page.
Added filter for languages directory, added one missing textdomain
Update edd_get_payments to use an array of arguments. See #307
Add labels for Metabox checkboxes for easier clicking.
Merge pull request #331 from mps/patch-1

Add labels for Metabox checkboxes for easier clicking.
Merge pull request #329 from spencerfinnell/get_payments-dev

Update edd_get_payments to use an array of arguments.
Merge branch 'master' of https://github.com/pippinsplugins/Easy-Digital-Downloads
Fixed incorrect meta query value. Related #329
Merge pull request #327 from alexmansfield/master

"Settings Saved" Message Missing
Improving on #327
Improving on #327
Fixing my typos for #327
Merge pull request #328 from deckerweb/master

Added filter for languages directory (translations loading), plus one missing textdomain
Added 'no checkout page set' error for #330
Merge branch 'master' of https://github.com/pippinsplugins/Easy-Digital-Downloads
Added missing closing anchor tag to "Remove" link in checkout shopping cart.
Merge pull request #333 from themeblvd/master

Added missing closing anchor tag to "Remove" link in checkout shopping cart template file.
Updated readme with a note about Software Licensing
Added Drag&Drop Example
Dossier clean, départ du projet
the beginnings of the neural net learning algo
added NN record
put all jade-related intermediate templates and data files into .jadecache
Continue in case of error
Revert to something more like original buildpack
Create adsa
Fixes #56 - Now works with Python 2.6 again
Added pagination support to some commands

The following commands now support pagination:
- list_vaults
- list_multipart_uploads
- list_parts
Fixed upload of small files. Closes #58.
Merge pull request #57 from gburca/master

Support for Python 2.6 and pagination
Localisation updates from http://translatewiki.net.

Change-Id: I71fbcb0b23955752ac5ca84e50f58272cbb55013
Fixed capitalizatoin
Ref : move part code to python forge for test assemblede pkg(access filesystem)
add *.local.php to config/autoload/.gitignore
Merge pull request #57 from Xerkus/master

Added config/autoload/*local.php to gitignore
Upated indenting and added ga code
Update sample answers files from the latest pe installer
Updated CHANGELOG for 1.0.2
Update CHANGELOG for 1.0.2
Update notes for submitted changes

* mogami: ti firmware prop update
Update notes for submitted changes

* nozomi: update storage overlay
libgralloc: don't IonAlloc::close_device() on error

It is possible to use this object from multiple threads
and there could be a race between a failure in one thread
and another method call from a different thread which would
result in system calls being called with an invalid fd.

(cherry picked from commit 560ca6e8feb4f52c9aade34fa7cfcfed55288083)

Change-Id: Iefb94ba1ee7177ab20600bee4374daf8e818bdb9
gralloc: Set total pmem size correctly

(cherry picked from commit 574e0998140becdfcebf11530bc10de3bcf31533)

Change-Id: I67b1530de43dab609261efa592dc41e030c157ef
Restructured the media queries and related assets

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
Remove parts of the 320 and Up Framework

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
Added speaker images

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
Added social media icons

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
Added a styles sheet to deal with oldIE

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
Added section headers

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
Various assets

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
Added jQuery ScrollTo plugin

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
JS functionality, compiled to /js/script.js

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
Compass Config

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
More content complete HTML

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
More complete CSS

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
Image Sprite

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
Ignoring generated CSS and JS files.

Signed-off-by: James Pearson <james.pearson@bitmodelabs.com>
Merge branch 'master' of https://github.com/FishPi/FishPi-POCV---Command---Control
read GPS sensor
Merge pull request #14 from grayal/master

Updated GPS code
make more generic for date instead of datetime
Merge pull request #11 from athal7/date-time-fix

make more generic for date instead of datetime
Merge branch 'master' into dkaufman
removed gimp file
Corrected includes for multiarray.h.
Add su binary and SuperSU.apk version 0.94

Change-Id: I753deb9ac760c196854d2c253d9ac290684824f3
logo.jj
VI release
all: Use pragma for windows subsystem selection
Fixed issues with submodules
Updated mwtao for latest version of tao
Updating data and adding quotes.
added cron to the bin
removed .DS_Store & .Keep files
applied pull up method on the tests package
* Compiling an IE<8 stylesheet
* Loading the stylesheets in the right order
Issue #64

This fixes most of the IE8 problems, there's still some stretched
images, etc. But the site is much more usable now.
Merge pull request #81 from karlwestin/fix-ie8

Fixing most of the ie8-stuff
Fixed typo in installer ProcessPanel config
Mms: updated Czech translation

Added translations for templates, Quickmessage
Updated pluralities
Now the translation should be complete
I let the QuickMessage nontranslated as it is feature name

Patchset 2: Fixed according to inline comments
Patchset 3: Missed soft keyboard type translation
Patchset 4: Fixed according to inline comments no. 2
Patchset 5: Removed capital letter after :

Change-Id: I78124605fc9f542c8810f6aa74d2df9f09d78d67
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_packages_apps_Mms into jellybean
Nullpointer in trackingservlet opgelost
made the menu the possible things
Instruções no Cadastro
Fiddling with columns
added additional stream to bd pages
Google Analytics
Added atom feed
Feeburner button
Added twitter button
Fixed pimpl/fdecl post with respect to a comment on reddit
Embaddable class
Fix FC in Bluetooth due to MAP

This commit fixes a FC in the MAP implementation when a vehicle sends multiple MNS notification requests. The old implementation would disconnect and then reconnect, however this seems to cause timeout problems on some vehicles. This specific behaviour is not specified, and there seems to be nothing wrong with re-using the existing obex connection.

Change-Id: I165544449180334e35c1f9510ace8d11ee215a55
Launcher: increasing the lower bound and upperbound of loaded pages to avoid stutter in applist scroll

Change-Id: I8fed59569129cc1c062ffdb287183531c1f84dbf
Merge "Launcher: increasing the lower bound and upperbound of loaded pages to avoid stutter in applist scroll" into ics
Merge branch 'ics' of git://codeaurora.org/platform/packages/apps/Launcher2

Conflicts:
	src/com/android/launcher2/AppsCustomizeTabHost.java

Change-Id: Ifbdb1d112d87d571525f27750254c30fb41feb66
ARQ-1226 Do not copy test-class resources to classes as they will be part of the final artifact.
ARQ-1227 prepare release 1.0.0.Alpha5
ARQ-1227 prepare for next development iteration
updated clustering scripts
Signed-off-by:Syed Asad Rahman <s9asad@gmail.com>
Adding NCDevCon preso
Updated file

Change-Id: Ie4794d3f52142f6ce23950d5b39aba98ea16d7f7
Does not allow use of wildcards anymore.
Update src/project_clean/Parser.java
four corners challenge
updated readme to include Vallandinghams awesome gistv
I think you missed to mention which adapter you're looking for...
Merge pull request #3 from Solgema/master

There's missing the kind of adapter you're looking for when retriving images.
add Manifest.in to include README.rst, update documentation, fix typo
moved out tools
Minor index fixups.
Added back the .gitignore.
bring in some twitter avatars
updates to latest rl2
Add a StaticPages controller
app has an about page
static pages have a descriptive title
Refactored out duplication in static pages
Added mysql-server to hive deployment
Merge pull request #54 from Paul-Webster/pull-req-release-fred-master-c998ac2de47cdc38bd201d704eebe1518c0d7cd0

added support for hive metastore remote mode. [2/2]
Incuna logo - trying to get the alignment right!
category files and sample project
new design
improved new look. ready for go live
minimized require list
Press return to spawn the first time.
add sample for reslease
。。
Merge remote-tracking branch 'origin/zip-resource' into zip-resource

Conflicts:
	.idea/workspace.xml
dai gianluca
CAZZO
Updating Gemfile to pull from the read-only repo url.
Site updated at 2012-10-11 17:33:22 UTC
Made single site compatible again
ignore ds_store files
Added exercises seq-max and longest-sequence.
Added exercises take-while and drop-while.
finished off readme
correct way of adding l10n
removing code duplicated on the documentation.
parameter-type for cross and sum method in Set
completed clock
Updated gems with security fixes
Fixed issue #31
Repository-Umzug von linuxmuster-client-testing nach precise-testing
Make changing passwords in ActiveDirectory possible.
Raise exception for password complexity errors.
update linkedin profile
Update App/artificial_consciousness/src/ac/memory/persistence/README.md
try to get out from the poor performances
Updated grid logic

Loop was counting down intstead of the assumed counting up
cascade type of subteams has members entity pk
Advanced Reports 2.4.0
not sure what happned here
Revert "not sure what happned here"

This reverts commit a6f5cd148fed12ca7da2bb65d44843dc43b4d0bb, reversing
changes made to f7b4b6914f237ac91dda3d6322ec3704070d8e1d.
Revert "Advanced Reports 2.4.0"

This reverts commit 9a4e17ce130f2aed5d6376a7c5511cd433918685.
Advanced Reports 2.4.0
Fixing merge
Updated _posts/pages/2012-09-07-contact.md
Upgrading Grails plugin version
apply headers styling to all headers, fixes #95
option testing
Another attempt to fix pdf_form_filler deployment error.
Bring back tooltip
When pressing "Contribute", If user is logged in redirect to "add module" instead of login page
Add error message for db connection
rationalize transaction use
merge processing
libcamera: initial working implementation

Based on libcamera gingerbread source & rapmv78's cameraHAL

Works: preview (including barcode scanners, camcorder), taking pictures
Doesn't work: barcode scanner image recognition, camcorder (maybe due to encoder problems)
Enable BOARD_HAS_QCOM_HARDWARE & configure HWA

Remove obsolete files, include new options to configure full HWA
support with new Adreno ICS libraries.
Disable slow blur
Replace Bootloader reboot option with Download
Prevent weather widget from cutting off lockscreen buttons
Misc overlay changes
Update extract-files.sh script
Update ueventd permissions, small wpa_supplicant service change
Remove legacy prebuilt kernel
libaudio: don't use SND_DEVICE_MEDIA_SPEAKER
update madconfig userinit script
Add: analytics ID
Quellen aktualisiert,
Abbildung erneuert,
alpha version of conductor
alpha version of conductor
split class into header (definitions) and class itself files, refs #18
added jscript to load home if hash tag is empty
reorganzing adding readme
made sql statements more efficient
Updated Status document
update address module
add Conkeror - Getting Started - Part 2
Settings: PT-BR translations

Added and corrected PT-BR translations.

Change-Id: I7d59a1faedaa80a0781a970840b4cb629e9b713b
what i don't know
added theme for mecha
fix wrong characters in uploaded filename
- Small name changes
- Still needs better naming in some abstract methods
joy fish add
added text to plate
Localisation updates from http://translatewiki.net.

Change-Id: Ib09e0aed0d8996006555b52457a47110617983b4
puhsing home page changes with logo and footer changes
Fixed bug in Integer serializer.
Cambio de lugar de la biblioteca de ImageJ

Se ha metido el .jar de ImageJ en el directorio /lib
Commit obligado por Eclipse y Git

No cambia nada del código
Disable VSYNC
Revert "Add back AMR as well"

This reverts commit 4f40bd542b7f2693f500d510d67a2a2057cdf8ff.
Revert "Add support for EVRC and QCELP for Qcom"

This reverts commit c3db0bbd0790bfebdacc474bc4c28331db954f0c.
Update notes for submitted changes

* u8150: Allow VPN device (ppp) to be tethered
* u8150: Change compcache RAM reservation back to 18%
* u8150: Update UsbController.cpp code
* u8150: Update to WPA Supplicant VER_0_6_X
* u8150: more appropriate dimensions for LatinIME
* u8150: clean up old, unused options in BoardConfig.mk
satsuma: recovery mass storage support fix
Update notes for submitted changes

* audio/msm7627a: Add support for STRATEGY_ENFORCED_AUDIBLE
add read me file, default credit to "no"
exit
Add funtion to the Framework.
Modified comment in camera.cpp.
Merge pull request #72 from DavidMansolino/FrameworkImprove

Added function in the Firmeware
Corrected populate task
Finished with exercises from chapter 10
Added user microposts
Updating api doc link
adding status info to school data
adding status info to school search
UserInterface: refactor IO to use Threads

This class is our largest Fragment yet we perform lots
of tasks on the UI thread causing delays before
the screen becomes available to the user again.
Executing IO in worker threads are particulary useful
if we are executing large IO intensive methods
with void returns.

 + Moved all IO operations off the UI thread
 + used finally to ensure closure of all streams
 + included faster copy method utilizing FileChannels

Patch Set 2:
 + chop long commands into multiple lines

Change-Id: Ib02e24c70b967b28dea21a86be0f03b702fad4fa
Cambiado el color de fondo
Agregada la pagina de Contacto
Fix black screen
Merge pull request #2 from Rashed97/patch-2

Fix black screen
Added mouse down detection for iPhones.
Cleaned up where tilt detection changes the buttons.
navbar alpha settings
Nav bar glow times and color
Add simple caching to XML compilation

XML compilation stage will perform many (expensive) resource ID
lookups - for the same entries. Adding this simple cache can
dramatically improve performance of this stage (often a bottleneck)

Updated: fixed for Mac OS X (also tested on Windows, Linux)

Change-Id: Ib1ab82ba9bf901bc2a3f9027b47d680861d6c315
Signed-off-by: Jorrit Jongma <jorrit@jongma.org>
Merge "Add simple caching to XML compilation" into jellybean
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_frameworks_base into jellybean

Conflicts:
	tools/aapt/ResourceIdCache.cpp

Change-Id: I3cf5d9a7796d1f5009522290995cba5ee19bb325
Resources, zmiana w oknie powitalnym
updates to move format to a new repo
- Implemented force generators
- Refactored code
Disable some debug output
Demote error of 'DSL + AspectJ not supported' to a warning. Make sure the warning is logged in the error log instead of popping a dialog.
Null check for schoolName
Merge pull request #5 from scottksmith95/master

Added null check for schoolName field
msm8960: Update kernel headers

 * To match new kernelspace MDP with VSYNC and 4-layer support.

Change-Id: I13f9c92afe45ea00bcf6c69df248037e7d9317a4
msm8960: Update Qualcomm post-boot script

Change-Id: I2ae0094e224e8e3d2fa62cda9eeb70236e6c8490
msm8960: Add system properties for display drivers

Change-Id: I3f8ab2981ad5879c4d84d4b1918d1b163dfc3f0f
Fixed url reporting in request log
Updated success styles on device control modals
Suppress access token header values in request logs
ARQ-785 Added Javadocs for the new classes in the managed containers.
Cosmetics
[PATCH] [vioserial] Fixed EvtDeviceD0ExitPreInterruptsDisabled return value. \EvtDeviceD0ExitPreInterruptsDisabled returned STATUS_NO_MORE_ENTRIES which caused the device not to wakeup after system was put to sleep (or hibernated). It now returns STATUS_SUCCESS if ports iteration was completed with status STATUS_NO_MORE_ENTRIES.
[NetKVM] BZ 826596 partial fix - guest checksumming synchronized with RX checksumming
[NetKVM] BZ 826596 - RX data path optimizations
Expanding facade section.
Fixed the typo, added further instruction about js file.
Fixed so that the plugin works with Cordova.
update on cap
Removed empty .gitignore file.
fix hardcoded table prefix
Reorganised audio files.
GOt Chutzpah working using Sinon
Added some other example test examples
Merged code
Additional resources
Merge branch 'master' of github.com:donwilson/Distynct-Javascript-Libraries
released, big windows plattform improvments
Fix WiFi driver and add Force fast charge
add test for kickstarting
nuke torch
Bring in Profiles support from mr0

Change-Id: Icae838838ce2c34aec22c50f166b957205db8394

Conflicts:

	res/values/arrays.xml
Relax bounds on containers
Add news Planejamento em Operações de E-Commerce
sudo Ant minify
cleaned up permissions and routes
removed small glitch in tt_info_controller
Working numbers and listings in table. More CSS work needs to be done.