labofsahil/github-event-dataset-2012 huggingface dataset:
minor langpack update

git-svn-id: http://svn.miranda-ng.org/main/trunk@2789 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
fixed control size

git-svn-id: http://svn.miranda-ng.org/main/trunk@2790 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
fix for last char eating

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1619 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
FS#34 > making canvas faster -- cleaning code
command description updated
Update cow in the right place

Currently, the update_cow call happens in the :build_deb
task, which breaks if using package:deb. This is because
:build_deb is a super-task that calls to the different
building methods, e.g cows vs not cows, depending on what
arguments its given, and we don't have everything set to
run a cowbuilder update in the dpkg-buildpackage call.
This commit moves the update call into the pdebuild method,
where its always and only applicable.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
genetic algorithm generation of units now works
Ya funciona el IF y el WHILE, falta probarlos anidados
Merge branch 'aridane'
Possible fix for false start battles

Signed-off-by: David Silver <dms.silver@gmail.com>
fix JSON bug
remove warnings
fix compiler warnings with kStmt_TypeCheckByName(), new_ConstValueExpr()
fix coding style
bug fixed at kExpr_PutConstValue() : take care about boxed value.
add proof
Merge branch 'master' into dse
put back in something I shouldn't have taken out
Added tests for on, emit, and removeListener. removeListener still has a failing test for some reason
Ticket #160 - Handle fluid width containers better. Remember,
fluid width containers will no longer be fluid after using reflow()
or reflow('width') because on reflow we change the style="width" so
the width becomes hardcoded.
Ticket #160 - Added tests for reflow()
integrate edgehandles plugin
Dodana klasa TampList.

Klasa bedzie miec funkcjonalnosc podobna do STL vector.
Poprawiony template listy.

Dodany do srodka template wezla listy.
Dodatkowo niekture elementy Thing, te
majace byc dostepne w dziedziczeniu zostaly
zmienione z Private na Protected.
yiiflavor
Change 'authenticate' call to a 'authorize' to handle handle Read+Write permissions
Modification du script de la DB
Making the forms pretty
Eliminación del Light.Master
server: added a '--dont-log' option to stop logging certain IP addresses
Installed gem rails admin
Merge pull request #135 from RaoJi/master

AI已经可以自由寻路，thickyAreaComponent出现了问题。
更新
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal
更新武器拾取与射击
Merge pull request #136 from xujianming/master

更新武器拾取与射击
Make some methods in BattleState script-accessible and connect MenuState with BattleState.
Merge branch 'master' of github.com:EternalWind/The-Dark-Crystal
修复Character在箱子或车上不能跳跃的bug
Merge pull request #137 from aeronzhou/master

修复Character在箱子或车上不能跳跃的bug
AI系统每日一更新。
Signed-off-by: RaoJi <littlekfc@163.com>
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal

Conflicts:
	src/main/Character.cpp
Deleted unused code
Moved "functional" functions into subpackage.
Moved return exception code into Return function.  I'm not yet happy with the ExecutionContext or how I'm handing scopes / return function / attribute lookups.  ...hmmm. <ponder>
Added support to get input from user via console.
add completion handler block to instead of delegate
Finally fixed ResponseTime, I hope
/help/ru_RU: fix previous commit formatting

-Delete unnecessary spaces.
-Add indentation to html tags.
JOANNE: 'added 3 joanne files blog_landing, blog, search'
JOANNE: 'added template to file names'
test code
make
comment box
Removed bugs-everywhere ... :-(
Workaround of SharpDX bug with MediaEngine.PlaybackEvent.
Couple of shader fixes for GL ES.
Added missing TouchInfo.cs to other csprojs.
Major refactor of setting GL state.
Removed mostly useless GLStateManager.
GL now defers setting of GL state until draw via GraphicsDevice.ApplyState().
Started adding an extended shader API into GraphicsDevice... it is internal for now.
Changed things in Calendar(model) so that the InvitationList can read from there
Updated lettuce/tomato
QA automated test config
removed check assert device
Be compatible with OSX 10.5
Ignore installation media
Getting there with the config.

Added a Makefile lovingly stole from someone on github.
[SPC14] Sigo retirando cosas.
editView is now a required property
WM-3875: The default LiveView automatically adds composite keys in wm.getDefaultView
Fixes handling of related objects that are composite keys rather than live types
No longer creates a new LiveView, instead edits the existing LiveVariable's LiveView
Fixes rounding bug; now uses floor instead of round, and adds extra pixel to first % sized
Smooths out the prior rounding fix
More fixes to the fixes
ToggleButtonPanel now shows up in Simple bind panel
Fixes bug that causes subheadings to show when none of their properties show
wm.prop.EventEditorSet now generates/formats/positions its own help button
Changes editColumns operation to Edit Columns
Fixes the width of the sizeEditor
Removes comment
Adds titlebar and close button to save progressbar
Fixes color of text in bound editor for non-webkit browsers
Adds styling to all themes for ToggleButtonPanel
Fixes invalid widths
Merge branch 'master' of https://github.com/SpringSource/wavemaker
WM-4673: adds _onHideParent handler
Fixes infinite loop by overriding call to adjustFlowForMobile
Insures window[PhoneGap] has initialized before loading application
Merge branch 'master' of https://github.com/SpringSource/wavemaker
Feature: Progress on Postgresql CDR backend for Asterisk
fix port for mysql
More advanced logic to import local calls / extensions / International calls
modified the exported calendar name
added email config settings (keeping it in non-tracked local_settings.py)
managed to attach ICS file to email
added some sample email addresses
套板前
套板前merge
fixes Translate Bug on Zoom In, issue #1
cleaned files in dev branch
Added JSON XML and CSV pages and buttons to main navigation
Trying IntellijIDEA out.
Updated the IClipboard interface to make sense.

Changed it to accept a string instead of a DataPackage.
Undid those changes, was in test project
Added Some composite key functionality
Got transformkey working
users not repeating
Tweets loading randomly
added admin checks on /clearallbricks to make mold be quiet
Added redmine 2.1 and redmine 2.2 compatibility (removed redmine-1.4 related code)
switched to CM7 repos
[Rakefile] Add "test_app" task
[travis] Changed before to "rake test_app"
Merge pull request #4 from kalkov/master

rake test_app
modified:   pom.xml
	new file:   src/main/java/com/issoft/database/log/LogEntry.java
	new file:   src/main/java/com/issoft/database/log/LogEntryDAO.java
	new file:   src/main/java/com/issoft/database/log/LogEntryDAOImpl.java
	new file:   src/main/java/com/issoft/ftp/model/TempDirectory.java
	new file:   src/main/java/com/issoft/ftp/model/TempFile.java
	new file:   src/main/java/com/issoft/ftp/util/LoggingAspect.java
change commit to log; add method to find all git commits

find all git commits on particular date, with author line matching the string given in the "--by" option
Unsetting link_attributes
Added windows cleanup script for sifteo generated files
Finish User Validations
Make a basic User Model (including secure passwords)
Implemented logging in, logging out, creating account, submitting trouble reports. Refactored popups and top bar widgets, implemented popup modality.
Perfect user management system but can't send email that about forget message to user
delete file s_sed1.sh
Add licenses
change name for ovirt-mom
sound stuff on its way!

Signed-off-by: MGZero <steven.calandra@gmail.com>
Merge branch 'MGZero'
Small hack to fix 100% CPU on a given core by the audio thread.

Signed-off-by: gm112 <gm112@zfgc.com>
Merge pull request #8 from ZFGCCP/gm112

Small hack to fix 100% CPU on a given core by the audio thread.
I don't like hearing a buncha hearts when I press enter. =(

Signed-off-by: gm112 <gm112@zfgc.com>
Fix 100% CPU Usage by audio thread. Audio Thread now fires upon program Update() call.

Signed-off-by: gm112 <gm112@zfgc.com>
Merge pull request #9 from ZFGCCP/gm112

* Fix 100% CPU Usage by audio thread. Audio Thread now fires upon program Update() call.

Signed-off-by: gm112 <gm112@zfgc.com>


* I don't like hearing a buncha hearts when I press enter. =(

Signed-off-by: gm112 <gm112@zfgc.com>
CSprite now adds itself to the drawList.

Signed-off-by: gm112 <gm112@zfgc.com>
Merge pull request #10 from ZFGCCP/gm112

CSprite now adds itself to the drawList.
Merge branch 'master' into MGZero

Conflicts:
	King of Thieves/King of Thieves/Game1.cs
	King of Thieves/King of Thieves/Sound/CAudioPlayer.cs

Signed-off-by: MGZero <steven.calandra@gmail.com>
Added new theme to handle ajax callbacks
modified wording of lazy evaluaation
Fix minor alignment issue with use image
Modified Publisher name in Application Package manifest
Fix failing tests after refactoring of ViewModels
Spiking client implementation
Fix for Bug 875949

Refactored following https://github.com/openshift/origin-server/pull/866
Update comments in setup_pam_fs_limits.sh
Merge pull request #875 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #877 from jwhonce/dev/bz875949

Merged by openshift-bot
added cancel order option for users
Removed unused variables
Add state variables to model for testing
add namespace.js back in
Add Clients and Orders to configuration.
admin footer asset link
matthias version
Merge pull request #1 from mattgu/matthias

matthias version
Test
Test
Test
Test
Formated items request to use a the format: {data: []}
Added item ID to item request
Item info is now shared between server and client. Server only sends the ID of an item and the client knows where to find his image and maxItemCount.
Added new message to forgot password e-mail. Fixed some bugs
Implementade error and success messaged of change password
Moved keep logged in storage from mongoDB to Redis
Added terms and privacy
Added contact link at footbar
Added createdAt and updatedAt fields to all DB models
Fixed bug that created enemies could not be renamed
Added some validations for server side APIs
Added limit of 20 character to enemy name
Fixed bug related to filter messing with enemies order
Changed signup message regarding send e-mail policy
BUG: items list was refreshing everytime a state of a new game changed. The problem was that a sync event bind of the created game kept refreshing the game after every update of the game
mais correcoes na parte das notificacoes
adjusting the tests to use the "mocha"
new rebar binary, which does not depend on R15
updated version requirement for jiffy
list sorting to avoid failed tests because changed server behavior
added support for setting multiple properties at once.
Fix bug in binary dilation and test case
add local binary pattern texture analysis
apply PEP8 guidelines
merge contributors changes
fix typos in doc string and comment
add example script for local binary pattern
move local binary pattern example script
make local binary pattern example script use skimage sample images
add plots to local binary pattern example
rewrite local binary pattern in Cython for performance reasons
fix bilinear interpolation when position outside of image
fix test cases for local binary pattern

test results changed because border handling of bilinear interpolation changed
improve doc string of local_binary_pattern function
use new subplots function in example script of LBP
Share bilinear interpolation function for other code

Make bilinear_interpolation function callable by other cython code and change
fast_homography to use this function. Also, improve performance of some
functions by making them inline and fix broken test of fast_homography.
Use shared bilinear interpolation function and improve performance.
Wrap column
Add doc string to bilinear_interpolation
Rename matrix transform function and remove from pxd
Add full-stop at end of short doc string description
Remove unused imports and wrap text
Add dope, dj, and unminified jeesh. Replace domData with dope in index.html. The domdata dir will still exist (with the last version under that name) but is now off the grid.
Restricted bcrypt to 0.5.0
add basic TODO list.
adding vstack.gdb
Lint javascript in strict mode
updated: Readme.md file step4
Notas interesantes de configuracion y puesta en funcionamiento de la
aplicacion
Usa una tabla temporal para los cruces de forma que asociando ids
ngmep-osm es más rápido
added ipad Makefile
removed all static files for admin and tiny_mce apps. because ./manage.py collectstatic make it correctly
recuperar index
tile fixc

Signed-off-by: unknown <fetus@fetus-PC.(none)>
paralax
Merge branch 'master' of git@github.com:alienfetus/ZombiePunch.git
Added the old Qt4 EKF for playerstage
added vias for external power connection
Added Show Boat function and logo
Finalizados todos los tests, creado fichero travis ... Fianlizada la practica.
Split configuration across different files
+ vundlerc vundle configuration and bundle list
+ keymaprc custom mappings
+ filetyperc  per filetype configuration
categories clean fix
Merge branch 'master' of https://github.com/andreasnesheim/Minerva
menyfiks
Merge branch 'master' of https://jay-d@github.com/andreasnesheim/Minerva.git
treng ikkje denne
Merge branch 'master' of https://jay-d@github.com/andreasnesheim/Minerva.git
Merge branch 'master' of https://jay-d@github.com/andreasnesheim/Minerva.git
Merge branch 'master' of https://jay-d@github.com/andreasnesheim/Minerva.git
Merge branch 'master' of https://jay-d@github.com/andreasnesheim/Minerva.git
treng ikkje denne
Merge branch 'master' of https://jay-d@github.com/andreasnesheim/Minerva.git
asdasd
Merge branch 'master' of https://jay-d@github.com/andreasnesheim/Minerva.git
Merge branch 'master' of github.com:andreasnesheim/Minerva
statue.jpg lagt til i mappa /img/
Bug: topic_chooser finner ikkje bruke javascript filene
Lagt til hibernate shizzle
Laster opp twitterbootstrap, og 2 filer til topicchooser
Merge branch 'master' of github.com:andreasnesheim/Minerva
Test
Merge branch 'master' of https://github.com/andreasnesheim/Minerva.git
Bootstrap-filer
Twitter Bootstrap-filer

Merge branch 'master' of https://github.com/andreasnesheim/Minerva.git

Conflicts:
	Minerva/WebContent/css/bootstrap.css
	Minerva/WebContent/css/bootstrap.min.css
	Minerva/WebContent/img/glyphicons-halflings-white.png
	Minerva/WebContent/img/glyphicons-halflings.png
	Minerva/WebContent/js/bootstrap.js
	Minerva/WebContent/js/bootstrap.min.js
index.jsp
jsp-filer
поменял шрифт по умолчанию, включил тему Solarized
Forgot to turn on weather
Revert "upd bt and wi-fi drivers"

This reverts commit f4108a60830ef87ee371a3d019f07fa677cb7199.
Nani 2.1
Projet EUler
Class and Events
Except the search option, all other functions are working.
Refactored video playback so the player will appear in the same location as a shortcode when put into a page or post
split up stuff
Harmonize README and --help.
APE-4 test
MINOR - added github badge
Merge branch 'master' of github.com:apermanentwreck/cssoff
Default rake task and updated readme
Don\'t be afraid of more line spacing
edit post: Spring Environment Profiles 활성화 전략
extra/help2man to 1.40.8-1
core/linux-kirkwood-dt Add missing patchfile
extra/claws-mail to 3.9.0-1
force package build command to any available idle builder (#21)
feed for nodes of followed subjects
add vim pastetoggle
add moving across wrapped lines
new prompt
fixed crap
added solarized.vim colorscheme
added ctags stuff
changes to enhance vim-powerline
changed bash prompt
add a line to prevent auto-commenting newlines after comments
cleanup
add FLOW_SERVER and JDK_HOME to .bashrc
Merge branch 'cherry' of github.com:arrogantrobot/dotfiles into cherry

Conflicts:
	.bashrc
	.vimrc
audio engine refactored
opened bug #1219 re this issue
took out class, I will introduce it later
make this example self-contained as far as the demonstration is concerned: have it set up the really long pathed binary and then run it

Aleksey
I don't remember what this was for anymore.
new demo
does not work
renumbered everything again, going from tens to hundreds, to make it easier to insert chapters
renumbered chapters from tens to hundreds
adding definition of declarative programming
automatically insert chapter breaks
renamed some stuff to make it look prettier in the "ls" output
renamed some files to make them look prettier in "ls" output
fixed chapter file names
fixed typo in chapter file names
renamed chapter file name
added an example of interfacing with selinux
moved my to-do's into a to-do file offline instead of cluttering up the training examples directory
added chapters 300 and 310
added chapter on regular expressions
added Functions chapter
client fixes and improvements
make the ball to move
Update README

[otf: 30]
NO major change, sort of backup
Trying out scampi + s3 support
Refactored hasUploadFields in FieldManager model

It was misspelled and it needed some spaces-love.
int test
a
gui1: Add border case for gui::dialog::BUTTON_TOP

When there's only one button with this hint, and there's a textbox, try
to align the button to the textbox. This makes the Filter/View Mode row
in the Add-ons Manager dialog look tidier.

git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@54298 75b3775d-3801-0410-9e12-e2e43121521d
Better way for temporary_unit_mover to change movement.
(It now handles negative movement the same way unit::set_movement() would.)


git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@55331 75b3775d-3801-0410-9e12-e2e43121521d
Added some data to the config sent from multiplayer host to clients on start of new campaign scenario. Fixes bug #20262 and bug #20261
Removed some commented code.


git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@55629 75b3775d-3801-0410-9e12-e2e43121521d
Mouse overlay for the place unit editor tool.
Even in team color, yeah!


git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@54828 75b3775d-3801-0410-9e12-e2e43121521d
introduce [item]redraw=yes|no (def yes) parameter

This allows wml/lua authors to optionally skip [item]'s implicit redraw
call. shadowmaster was experiencing some negative
visual effects due to this.

git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@53882 75b3775d-3801-0410-9e12-e2e43121521d
changelog update

git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@53883 75b3775d-3801-0410-9e12-e2e43121521d
scotsman: increase error threshold
Merge branch 'master' of github.com:bcampbell/journalisted
add latest tg
Merge branch 'master' of github.com:bcampbell/journalisted

Conflicts:
	jl/templates/tobias.tpl.php
Rename healthChecker to healthchecker
Add Cheetah package
Added a simple test suite kind of thingy.
Added an event handler.
Namespaced run_test.
Refactored WMS test fixture in preparation for adding 16-bit tests. Added Adelaide River mouth test data.
Added test for 16-bit band data for Adelaide River Mouth.
Implemented false colour layers with scaled data to support 16-bit bands
Updated DTD of all copies of wmsConfig.xml to match false colour test fixture
Refactoring and documentation improvements.
Updated README.md to describe new format for wmsConfig.xml
[check-constraint] Add Exception for check
[check-constraint] Add method to createCheck in table
[check-constraint] Add test for table
Changing plugin base models for a more intuitive understanding of what types of models should exist. The image model should maintain revisions of itself to avoid a difficult process when replacing images.
ma nizmaaa
are you freaking kidding me, a comma?
Adding target image class parameter
typographical tests and changes
added body and header bg color, created less color variables specific for myuw
remove some hover stuff in buttons.less
add site bacground image, change the foot part style of pages
Inkl. generieretem PDF
Subkapitel angepasst
Formatter: Wrap comments after 100 characters
Merge branch 'master' of github.com:bieridee/bieridee-docs
re-factoring php code with phptidy st2 plugin
Added breakpoints support
results restored 2
Progress on playing.html
Merge branch 'master' of github.com:biggs0125/SideProjects
Added link to GitHub page to Bio2RDF webapp index template
Minor change to webapp homepage
Merge pull request #13 from alisoncallahan/develop

Added link to GitHub page to Bio2RDF webapp index template
Octopress init
Site updated at 2012-10-19 10:10:16 UTC
lots of little changes, kinda getting there a bit.
Add unit test assertion that an empty privilege list throws.
Code style change: use standard style for Unit returning methods.

Per http://docs.scala-lang.org/style/declarations.html#methods, use

  def foo(bar: Baz) {
    expr
  }
Use class basename instead of java.lang.IllegalArgumentException.
Use class basename instead of java.lang.Throwable.
Use class basename instead of java.lang.NoSuchMethodException.
Use class basename instead of java.lang.String.
Use class basename instead of java.lang.Exception.
Use class basename instead of java.lang.NumberFormatException.
Don't name unused caught exceptions.
experimental refactoring
refactor....
refactorage working ...
refactorage working well...
getting somewhere
woot expression is done
remove extraneous
body-decl is done
adding simple scope multiple-inheritance model
maybe close to having inheritance model working
Finished a significant refactor

the methods:
 interpret-expression
 interpret-statement
 interpret-body-decl

have been replaced with one method

 interpret-in-scope :expression
 interpret-in-scope :body-decl

and similarly add-statement-interpreters et al have been replaced by

add-interpreters-to-scope

percolator users can add their own scopes, and there's an inheritance model as well

for example, the :statement scope inherits from the :expression scope
this is because every valid expression form is valid in :statement context
it just needs to be wrapped in a `(new ExpressionStmt ~expr)
the inheritance model allows that to be expressed gracefully:

(inherit-scope :statement :expression (fn [f] `(new ExpressionStmt ~f)))

This is cool, it made percolator a bit simpler and exposed a useful generic concept

Scopes, and inheritance, will be applied to wrapping GWT with shorthands
registers: Clean up SOLO_VI_CH_FORMAT and SOLO_VI_FMT_CFG fields
registers: Clean up SOLO_UART_*
registers: Minor clean up for bit-fields from several registers
registers: Clean up bit-fields of SOLO_VE_CFG{0,1}
Added a simple template for rendering form with django-cripsy-forms
added grid filtering
Failing test for empty-string filesystem loader extension.

See #123
Allow "empty" filesystem loader extension.

Fixes #123
Merge pull request #59 from bodepd/dev

Nova development for essex
Add lockfile as a paramater
Enable cert and volume service in nova:all
Merge pull request #61 from derekhiggins/enable-services

Enable cert and volume service in nova:all
Merge pull request #60 from derekhiggins/lockfile-as-param

Add lockfile as a paramater
Merge pull request #63 from bodepd/dev

Only set up apt repos on Debian
Debian OS does not use upstart
Change file title
Merge pull request #64 from fcharlier/fc/dev

Change 'upstart' to 'debian' as special service provider on Debian
Improve various network modes

Add support for VlanManager
Add support for multi_host networking in nova::controller
Improve support for FlatDHCP and Flat network modes in nova::controller
Fix typo
Add support for multi_host on the compute node
Remove bridge creation from nova::compute::libvirt

As this is incompatible with some networking modes.
Is there any reason it should be there anyway ?
nova-volume might not be ran on a controller
Merge pull request #65 from fcharlier/fc/network_improvements

Improve various network modes
Update nova test file

Update the file that can be used
to test nova.
Manage nova-compute-$type package

This commit ensures that the virt specific
package is installed on Ubuntu.
Make config of rabbit_host option

This commit adds support for the rabbit_host to be
determined based on the collection of a resource
that the rabbit host itself should export.

This was added to better facilitate multi-node deployments.
Add multi-node example

This commit adds an example manifest that can
be used to seperate compute nodes from the controller
where the controller contains every other service.
Fix exported resources

This commit adds exported resources to support
separating the nova compute node from the
nova controller node.

Adds an exported resource for the db connection.

It also fixes issues with the collection of resources
for the rabbitmq and db connection.
fix darkroom parallel_light
5-2-12
finished python problem 8
View searches functionality.
bump salat-plugin version

bump salat plugin version to 1.0.4-SNAPSHOT to have the mongodburi support
Lowered the upper limit on count before giving up on real headers. changed some newlines to PHP_EOL.
adding .xmobarrc
ADB over network - CM port (Settings part)
Revert "Quiet Hours (2/3) - CyanogenMod"

This reverts commit f4ac4ea512da3c66564c71b737a691756f698a80.
Profiles - settings part 1/2
Storage: Allow user to choose internal storage

Limited to devices that allow it (by presence of the ro.vold.switchablepair
property).

Ported from CM7's CMParts change I0f307858a0d443a295b30bffd8d66e89c425a13c

Change-Id: I73439e167d0e2a08e2e922d5c0930cdeebe64940
Sound Settings - Quiet Hours (Part 1 of 2)

    This is the settings part of the Quiet Hours settings, ported from
    CM7.

    Patch set 4 - Moved the setting to the Sound Settings screen.
    Patch set 5 - Make it work in the new location :-)
    Patch set 6 - Cleanup of some spacing issues
    Patch set 7 - Added Dutch translations
    Patch set 8 - Changed commit name

    Change-Id: I8a37b4cf9051135248ab9259376b9b023fcc1a6c

    Conflicts:

    	res/values-nl/strings.xml
    	res/values/strings.xml
    	res/xml/profiles_settings.xml
    	src/com/android/settings/cyanogenmod/ProfilesSettings.java

Conflicts:

	src/com/android/settings/SoundSettings.java
Settings: Fix font size mismatch in RingerVolumePreference - CM

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

Change-Id: I019a49e406c87c3b34c9f0535cd2b00f3836255d
Settings: Data usage: Linear chart option and 2GB to 100MB vertical axis limit.

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

Change-Id: Ia84ad580d9727ce9168f789fb15262c5c03ac8af

Conflicts:

	res/menu/data_usage.xml
Wifi: Update message when scan result is empty

Handle case when Wi-Fi scan result is empty

Change-Id: Ib09f030dbc0b71055a7aacf0848b97bd6c33af70
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Update Translation

Conflicts:

	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
Bluetooth : Remove out of range devices after ScanComplete

Change to remove device from UI when Bluetooth of remote
device is off or not discoverable anymore. Without this
change a device that discovered previously is available
in available devices list always, though the remote device
is not discoverable anymore. The current change updates
available devices list on scan complete removing the
devices that are available in cached devices and are not
disvorable anymore.

CRs-fixed: 342189

(cherry picked from commit a36655de1d572fc148352ef99cd56593492a194b)

Change-Id: I9cdc6e46f055875b953d60410e605fab27111437
add shortcut to theme manager

credit CM for images

patch set 2: fix intent

Change-Id: I7721dfff4b251a31f951256da038c2fab9a49d9a

Conflicts:

	res/values/strings.xml
	res/xml/settings_headers.xml
Add "Pulse low battery light" switch.

Implements the Display settings portion of an optional "Pulse low battery
light" switch, which allows the pulsing low battery LED to be disabled.

Credit: http://review.cyanogenmod.com/#change,12976

Change-Id: I5946578d4ab2c7e4affbbd834ccdfbb8beca0a25
Signed-off-by: Jeremy Blankenship <jerbla88@gmail.com>
Update Chinese Translation
Fix Merge Derp
Moved advancement to global module settings
created stub form
added flash notice to app view
added logout route
added login/logout links to app view
added login to create to only display msg on successful login
changed redirect path on logout
changed login/logout flash message to dynamic status msg
Add basic implementation of Redis::Types::Set
Add Redis::Types::Array#destroy
Passing specs for Redis::Types::Set
Add marshalling to Set persistence
Redis::Types spec now fully cleans up after itself
Added the beginnings of some game state saving stuff to the controller. Also started adding some of the character attributes and stuff to the instance variables and object initializers.
Adds OSX gitignore necessities and OSX JavaCL library
README with quickstart
Fixed some Markdown syntax. Added docs for admin-www-webalizer.
Improved compressed file reading in admin-www-stats.
remove the extra parameter of transform.
Added test for #583
Added pointers to the IDE dev update site
Singleton element must be an Object
added pitch.py to init
Goodbye hot pink code
More refactorings
Refactor long container_javascript page
Refactor the rest of the library pages
Remove duplicate file
Improve text readability with better leading
Refactor several reference files
More font and header improvments
Fix escaped underscores
yaya bubble pop effects in place!
applied sussex template. first stab
Added checkin process & started list of checked in students
Goodnite checkpoint. Another short step
My camera class is coming along. Some weirdness remains
Octopress init
Site updated at 2012-10-30 00:24:36 UTC
Site updated at 2012-10-30 00:26:37 UTC
solved conflicts
removed useless file
sync master
disable escaping
Cleaned pup the code formatting.
Fix tool description showing, some cleanup
squash me last
HORNETQ-1094 missing dep on hornetq-jms-server for RA

* add org.hornetq:hornetq-jms-server to HornetQ RA dependencies
Merge pull request #698 from jmesnil/HORNETQ-1094_RA_missing_dep

HORNETQ-1094 missing dep on hornetq-jms-server for RA
HORNETQ-1018 - Move Messages fix
fixing unit-test
Little optimization on split code
Improving print-data and Xid.toString to better locate prepared transactions on print-data log
Speeding up RA tests
Resource adapter changes
AS7-4548/HORNETQ-913 fix and test
https://issues.jboss.org/browse/JBPAPP-8769 - fixing large message contentions on bridge and redistribution
gitignore on some examples
Readme how to make the release
fixes on jgroups plugin and its examples
leagues, drafters, and roster pages are all subviews of the settings
page
-asynchronous flipping between these views, and adding/saving elements
for each
-refactored a lot of code to follow best practices
Fixed copyright notice
Switch faye connected/disconnected callbacks
Version bump
Fix problem where /account/ calls didn't include session_token
tweak to send plain text password in email
renamed mailer variables
changed to use new api
added links to short bio and corresponding css change
Added support for iPad retina file extension. Implemented pull request 

https://github.com/cocos2d/cocos2d-iphone/pull/181
Merge pull request #184 from araker/ipadHD

Added support for iPad retina file extension. Implemented pull request
premier jet rapport 1
empty fixtures won't be created by 'save_staging'
Merge pull request #9 from wyld/patch-2

empty fixtures won't be created by 'save_staging'
logic for bling paging animation completed, adding some new blings, adding python script to create png frames from gif
fixed sonar problems
CSS build no longer uses dojo build system
toNumber helper for MML converter
[#31672891] Use Nextgen units for locating textbox

For consistency with https://github.com/concord-consortium/lab/issues/13
cleanup chars that would be invalid in JS strings

[#37716181]

... like the ones that got into the last commit message
because of a copy and paste from another text source
that made the lab.version.js generated code invalid!
use graph option points == "fake" for fakeData
use document.location hash for graph examples

So folks can share a persistent url to a specific example
Add license headers
Prepare for localization

Take the translations from anaconda message catalog, as this is where
the code should end up in.
[maven-release-plugin] prepare release storemate-parent-0.1.1
Round one changes
Add buttons. Twitter.
Home page move elements
CSS Fix
CSS Fix
Fix footer
Fix refresh banner
rebase numpy 1.5.1 on latest version in the main tree

Package-Manager: portage-2.2.0_alpha142
fixed another crash caused by invalid end SourceLocation value
Added CRM Print functionality. You can now print cases. Woot!
added in the pthread m4 macros
Remember previous geo option
Adding color encoding
Site updated at 2012-08-20 08:51:49 UTC
we don't use svg anymore
beginning of ball physics.
Update www/wp-content/themes/2012/application/app/views/ApplicationView.coffee
Levels integration
Pages Controller
Added espresso mode.
Template File Removed
TMPL parser possible works.
CHAR parser may possibly work.
Parse END records (just return END).
deb ugging paypal
eliminate bogus member fs of mntentry, which could alias device's mnttype field
fix 32-bit compile all the way
throw -O2 back in
Modify the way the string is written - works with Redis 2.2.12
Add HGet, HSet
Update README for HGET/HSET
Revert tree-based approach
added virtualenv.py
Merge branch 'master' of https://github.com/dariajung/hackny2012-f
add tricorder mod
replace @ with r

BUG=

Review URL: https://chromiumcodereview.appspot.com//10983039
fixing my broken css file

Review URL: https://chromiumcodereview.appspot.com/11368123
fix TOC links (and a couple of inline links)

BUG=5986

Staged at:
http://book.dart-lang.appspot.com/docs/dart-up-and-running/ch02.html

Review URL: https://chromiumcodereview.appspot.com/11293039
Make the search box look nicer.
Added missing functions
Merge branch 'dev_cleancluster' into develop
New package: ORBit2-2.14.19.
turned SliderButtonMorph into CoffeScript OO
Added Sharpen page with external ref.
Added extn image & broken link
Added myPod page
Refactored h1
Refactored H2
Fixed filename to match the module name
Added image and sizing
Halved the picture size
update urlP
fixed splashes
fix preferences dicom root
Create spec file for front-end restaurants controller.
Directory workage
Failing test demonstrating the problem.
Fix TTL semantics.

TTL is implied to be in seconds, but DateTime semantics mean that
the current calculations are actually in days. Fixes #1.
rename modMacro -> elementMacro
final commit w/ comments
Furigana
Furigana
Release 80: Nowy slownik, furigana
modified:   page_background.info
WIP - doing some cleanup
Available vs Forecast vs Billable - consider hired/resignation date of user in computing Available hours
minor ui enhancements on time logging popup
Merge branch 'dev' of github.com:den-plugins/management into dev
package.json is better than packages.json
devilry_subjectadmin...gradeeditor.Overview: Made subheading muted.
subjectadmin...BulkManageDeadlines: Wider add-button, and regular instead of primary buttons.

Should not use primary buttons for anything but cases where there is a _single_ natural default button.
devilry_subjectadmin.tests.managestudents_singleselect: Fixed failing.
devilry_subjectadmin.tests.managestudents_singleselect: Cleanup.
exe mac dotfiles #1
remove unsupported mail column from CSV export
unify and reference parts of address
Added pokemon team tabs which were left out previously
Fixed bug where tab was not setting the Layout and thus not rendering its UI
Made some changes in attempt to resize description.
This commit includes a series of changes related to the new http based
log and control interface, it is unfinished but functionally complete.
Added LaTeX template & README for beamer package
Lots of refactoring and changes.

Most of changes are for global and regional graph measures.
Changed adj loader and dependent objects to handle multiple types of adj files.
Add cache to tokenizing funcitons
added easy_ztp_server
Production email sender
Added django-kronos app to handle sheduled synchronization.
added option parsing; added squidRecord class to maintain cache data
Improve test "merge in duplicate models with {merge: true}"
Reorder code in Collection.add
Merge pull request #1327 from TheBits/silent-merge

Merge model with silent flag
Client view now receiving messages, but some weired DOMException is
still preventing the messsage content node from being processed...
DJP: added to the graph syntax section
Clean up controllers from global repo

* Most controllers will be provided via dradis_core
* We no longer need a WizardController, we'll point to http://guides.dradisframework.org
Clean up helpers from the global repo
Remove AuthenticatedSystem

We're implementing authentication from scratch in 3.x
Cleanup global repo: public/ and config/
syntax tuning
remove hidden field in search form
add pagination for Model with original backup code
moving paginate() from controller to Post model
sort tags in Tag#extract_names()
sytnax tuning
rename var
pagination finished by Ben
paginate trending posts
paginate latest posts
paginate unsolved posts
increase the number of seed data
paginate tag posts
remove comment code
paginate search posts
show keywords in search if exist
adding timelapse script
added missing jai dependency to unsupported/process
New version, with the famous 1pt left border.
column marker off
Changed init.js to wait for couchdb to be available before buiding the db
Updates for work done on 2012/12/12
Updates for work done on 2012/12/14
Comment the collectstatic function because if run on server, overwrite all files
Change alignment of footer
Change type of view for DomainEditView
updated connections and XML database
added new retina model
remove plugs for now
Modified some padding
Fixed FFFFFF thingy

Fixed FFFFFF thingy
Site updated at 2012-09-22 19:55:24 UTC
convert fixture RRD files to current CPU arch.

if fixture rrd files were created on another architecture, convert them.
added HTML5 footer tag and did indentation
Used 'path' plugin for theme loading
deleted stupid symlink
implementando cadastro de turmas com dashboard de turmas
defensive byte array copying
Bug 622491.  Make the global scope polluter work in standards mode too.  r=jst
Bug 700981 part 1.  Get rid of nsMappedAttributeElement::BindToTree and inline some of the things it used to call so they're faster.  r=sicking
Bug 700981 part 2.  Get rid of nsStyledElement::BindToTree/UnbindFromTree.  r=smaug
Bug 700981 part 3.  Inline nsNodeUtils::ParentChainChanged.  r=smaug
Bug 700981 part 4.  Add a fast-path to IsAllowedAsChild for the case of a child that has no kids.  r=smaug
Bug 700981 part 5.  Reduce the amount of time spent calling GetBindingParent().  r=smaug
Backed out changeset 0124795a8cbb (bug 711895) due to i10n build bustage.  r=me.
merge
merge
Change css3-animations behavior for repeated keys in an @keyframes rule:  do replacement on a per-property basis.  (Bug 738003)  r=bzbarsky

This implements my proposal in
http://lists.w3.org/Archives/Public/www-style/2011Apr/0381.html and
http://lists.w3.org/Archives/Public/www-style/2011Apr/0387.html .  I
think it was a serious mistake to implement what the spec says, and I'm
fixing that mistake so that we have a chance to change the spec.

In other words, when an @keyframes rule has two key selectors at the
same time, the later one no longer overrides the entirety of the earlier
one.  The overriding is done for each property that's in the later rule.
(And the -moz-animation-timing-function is taken only from the keyframe
actually used for the given property; if there's no declaration there
then the computed value of the property is used.)

The test for @keyframes cascade fails without the patch; the test for
@keyframes cascade2 tests behavior that works both before and after the
patch.
Bug 738022 - gonk gps - test GpsInterface size before using. r=jdm
Bug 738020 - add geolocation to the list of permissions that we autogrant. r=fabrice
Bug 738121 - disable compassneedscalibration event. r=jdm
Bug 738102 - devicemotion causes shutdown crash. r=jdm
Bug 737071: Remove LayerManagerOGL::glForResources() because it's not needed and causes performance degradtion sometimes. r=Bas
Fix build bustage caused by Bug 738121. r=me

--HG--
extra : rebase_source : 9943ace287e944ed84565a3d71271d411815c659
Bug 737814 - Mark nsIHTMLContentSink as obsolete. r=smaug. DONTBUILD
Bug 732480 - Don't build and package update-settings.ini when updater is disabled. r=khuey
Bug 736959 - Don't wrap PR_Malloc and other NSPR allocation functions. r=khuey
Bug 737084 - Do pthread_atfork in jemalloc on mac and android. r=blassey,r=khuey
Made AST structure
Move from javascript syntax highlighter to pygments highlighter
don't link anything to ios library
Login tested, and email/password is saved in shared preferences
Changed the schema for websites table, and added a new file to .gitignore
Changed website controller to get user id from session and for the form to not display all fields
readme.md (altered#6)
dodany opis wzorca singleton, lekkie przeformatowanie calosci
More work on Project page text
[WebSocket] Added missing method

Re-added the disableVersion method to WsServer
Updated composer meta
Updated composer lock file with latest React changes
Data view changes (work in progress)
Merge remote branch 'origin/master'
fake the images that the slicer will not create .. for now
Merge remote branch 'origin/master'

Conflicts:
	lib/ext/resources/css/admin.css
Match "features/new_feature" branches when deleting remote branches
Merge pull request #1 from oriolgual/patch-1

Match "features/new_feature" branches when deleting remote branches
Add reference to view samples source
Improved robustness around the creation of the PhantomJS temp directory
This is even worse, I should go back to the old one
bugs on bionic, working on high noon
added new quotes for gold mine multiball
view cache system is about work
Adding utils file
Add a type alias for map
Unit test AllStories (in order to prepare delete feature)
Adding Good Practices items
Ignored .vagrant because that's bad :)
Moved code button underneath block
Feature Listar Pacientes completa
Merge branch 'Feature_Listar_Pacientes' into develop

Conflicts:
	app/assets/javascripts/patients.js.coffee
	app/controllers/patients_controller.rb

Resolução de conflitos
Moved defines into include
Updated require
Tidy up
Updated composer
new drop in basic
Added a few directories and files to .gitignore
Updated vim definition
2.1.6

- Version bump.
- `base.html` HTML comments are now Django comments.
- You can now pass in a branch parameter to `grunt update`. Running `grunt update` now also updates using the branch you specified using the `rbp` CLI. (e.g., `rbp new example -b develop` will update from the `develop` branch when running `grunt update`).
- Removed the ability to chain commands via `grunt start` to make way for branch management.
- You may now use your `package.json` config to reference your own projects. RED Boilerplate's settings are now stored under `config.rbp`.
- `config.rbp` will now update on `grunt update`, so you have a reference to the latest RED Boilerplate version.
Abstract branchOverride var to re-use elsewhere.
Fixed AutoSave Lists. Now saves the full list instead of just the first Background setting (forgot to add [*] to arrays)
convert to php presentation
Update with github URLs, add autoconf dependency.
Fixed regen n' stuff
Modification to fit the current API of transcoding
commit#5: added input folder to repository
support all winston logging types
Merge pull request #8 from wavded/patch-2

support all winston logging types
add new ratings
rename checking -> checkin
add share to social networks in movie and episode checkins
added readme, license and changelog. bump to v1.1
add a load resource test.
load network resource by HTTP.
Removed notification directly sent from daemon.
Item11840: added =sort= and =reverse= parameters to RENDERMETADATA



git-svn-id: http://svn.foswiki.org/trunk/MetaDataPlugin@14776 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11840: preparing release



git-svn-id: http://svn.foswiki.org/trunk/MetaDataPlugin@14777 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11808: perltidy, v20120714 which has been installed on foswiki.org enforces a few new rules. Developers, PLEASE UPGRADE! This commit should help

I've perltidy'ed everything which had a TIDY file.
Also fixed all errors shown by perltidy (maybe still one encoding issue for Confluence)
I've fixed everything I saw with obvious perl mistakes though. Doubt anybody
will care, as most were due to a bogus Build::Contrib::createnewextension which
Sven fixed recently.

git-svn-id: http://svn.foswiki.org/trunk/WorkflowPlugin@15429 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
...project file
Add some CSS for the points app header
Merge remote-tracking branch 'github/staging' into staging
Prevent XSS on error page
add shared service
Aggiunti i messaggi di errore mancanti nell'Extend.
TFindDialogEx の実装を RTTI から class helper に変更
First Commit to git

Signed-off-by: freshie <tylerreplogle@gmail.com>
Fixed issue in rails 3.2
2012.11.02.0840
add horsepower kernel version 1.0.5
bare bones mvc 4 site
added obj, trying adaing
add new item and modify help view
backend: show registered useres for event
set speakers names and company spans inline-block and give them a margin
Merge branch 'master' of https://github.com/gentics/jquery-eu-2013
added responsive css (1280.css , 1600.css) added media quieries in index.html
Merge branch 'master' of https://github.com/gentics/jquery-eu-2013

Conflicts:
	css/style.css
fixed style.css
speakers are list items now and they are centered
115!!!
forgot to remove the red helper lines
Merge branch 'master' of github.com:gentics/jquery-eu-2013

Conflicts:
	css/style.css
updated speakers centering for all screen widths
fixed location background, image, position
Merge branch 'master' of https://github.com/gentics/jquery-eu-2013
change title to Hola 7
Update MvcApplication1/Web.Debug.config
refactors to remote unnecessary 'self.' everywhere
refactors the rake_string method
updates development dependencies
only run the seeds when the seeds file is modified
refactors string generation
adds the seeds file to the default template
Merge pull request #2 from glanotte/seed_only

Request: Run rake task "db:seed" whenever the db/seeds.rb file is changed
add isBlocked() to AbstractWO, remove (too simple) fsm implementation
Debug custom log implemented with Apache format filtering out the only client ip
Log Example:
[CLIENT IP FILTERED] - - [15/Jun/2012:07:41:14 +0000] "GET http://kpvz7ki2v5agwt35.onion/wiki/index.php/Main_Page HTTP/1.1" 200 - "-" "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:13.0) Gecko/20100101 Firefox/13.0"
Diversas mudanças. Provavelmente primeira versão funcional (somente ICMC).
Default to localhost if fqdn not set
Add Pocket button plugin
Merge pull request #1 from juba/master

Pocket button plugin
Separate payload from route key generation. Shutdown trigger.
Gem specification, code needs re-arrangement
Initial attempt to create a Github schema
Rename GithubAnalysis -> GHTorrent
Ignores
Gemify
Style fixes
Minor style fix
Add dependencies and binaries, add namespace in classes
Detailed list of files to install
Move library to own namespace
Base class for all GHTorrent commands
Use the command base class
gravatar user icons
Merge pull request #78 from clockfort/master

Add gravatar user icons
Cryptography Library for Password Hashing

Lib from http://www.autohotkey.com/community/viewtopic.php?f=2&t=5763
Made nose and devserver optional in dev-mode
remove travis, no default credentials
Site updated at 2012-04-16 13:08:21 UTC
Estrutura pronta
A few corrections to the tutorial