labofsahil/github-event-dataset-2012 huggingface dataset:
mm/truncate.c: fix build for CONFIG_BLOCK not enabled

Fix build error when CONFIG_BLOCK is not enabled by providing a stub
inode_dio_wait() function.

mm/truncate.c:612: error: implicit declaration of function 'inode_dio_wait'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from commit ed70afcd6e795e3de98df56f1cd0f898fbf641a7)
vfs: use ERR_CAST for err-ptr tossing in lookup_instantiate_filp

Replace unclear (struct dentry *) to (struct file *) typecast with ERR_CAST() macro.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from commit 5a9a43646cf709312d71eca71cef90ad802f28f9)
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: Fix trace_[soft,hard]irqs_[on,off]() recursion
  printk: Fix console_sem vs logbuf_lock unlock race
  printk: Release console_sem after logbuf_lock
(cherry picked from commit 391d6276db9fbdedfbc30e1b56390414f0e55988)
bridge: ignore bogus STP config packets

If the message_age is already greater than the max_age, then the
BPDU is bogus. Linux won't generate BPDU, but conformance tester
or buggy implementation might.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 0652cac22ce3fa0c90e35d0a2862969fc394cb02)
bridge: notifier called with the wrong device

If a new device is added to a bridge, the ethernet address of the
bridge network device may change. When the address changes, the
appropriate callback is called, but with the wrong device argument.
The address of the bridge device (ie br0) changes not the address
of the device being passed to add_if (ie eth0).

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 56139fc5bd6e740706993ab3ad0d0aeff69a8479)
bridge: add notification over netlink when STP changes state

When STP changes state of interface need to send a new link
message to reflect that change.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 4ecb961c8b474ebef5aff55f715c7875e69dd57b)
bridge: minor cleanups

Some minor cleanups that won't impact code:
  1. Remove inline from non-critical functions; compiler will most
     likely inline them anyway.
  2. Make function args const where possible.
  3. Whitespace cleanup

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 160d73b8455edb1a12967e207790b1a93a4cb0e1)
Makefile: add Wno-sign-compare
PEP8'ified to code a bit.
Merge branch 'work'
MessageList
Avoid direct access to config file
Filtro por instituicao no relatorio de transferencia de itens #308
Merge branch 'dese' of github.com:andrerezende/SIGA-ADM into dese
Merge remote-tracking branch 'origin/dese' into intg
Inventario FIsico correcao 1
Merge branch 'dese' of github.com:andrerezende/SIGA-ADM into dese
botao Incluir Material 2
nbproject en gitignore
Namespace Domain renaimed to Model
check everything in before the weekend
change made in file 3
added andrewthorp.com layout
changing editor to vim
Remove rebar.bat too
removed sbmanage,install,debug and optimized for fast boot
Added solution for #76
Updating vimux-javascript-test mappings
Adding git patch alias
if avec la fonction 'connexionUtilisateurReussie' qui permet d'afficher un formulaire différent ( si utilisateur connecté ou non)
Add symlink script and clean up dotfiles
Resolve merge conflicts
add .png image
battlefield sync
adjusted text around cross corpus and ablation
fixed heading on Table 2
hprof generation, not writing the first record

We miss some roots since the first record isn't initialized.

Change-Id: I50c80a701a4ee142c52602b9015f6e93be54da9f
Merge "hprof generation, not writing the first record"
Merge remote branch 'remotes/aosp/ics-plus-aosp' into merge_branch

Change-Id: If75beca870fde4265de30dfee0d8c503b120a0df
Tweaking UI controls
1.  Changed Disclaimer to be link button instead of a button
2.  Changed language selector to be a drop down list instead of a combo box

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/utilities/trunk@1425249 13f79535-47bb-0310-9956-ffa450edef68
o Updated docs on junit run listening, renamed classes in test
I realize now that adding the time derps with service status updates
fix RelationManagerImpl logger name
Merge pull request #13 from akaia75/logger

fix RelationManagerImpl logger name
Merge branch 'gyro-calib-fix' of git://github.com/Humhu/imageproc-lib
Merge remote-tracking branch 'biomimetics/master'
Added 'realtime' cumulatives tab within stack tree HTML page ^^
Sorting cumulatives on average
Being able to reduce events stack within the C implementation instead of Ruby
Add missing http/1.1 on simple get
Merge branch 'master' of github.com:arktekk/rest-workshop
Update some reference results
Tuned regexp for maven project version retrieving
made simple visualization of flashing white on every beat
The help info was amgibuous on what the mask values mean, clarified.
Merge pull request #93 from khogenso/master

Added clarification to --help info
media folder fix
Initial commit
added modules
ignore ruby dir
change statusline
add shortcut for gundo
remapped ` to ' for easier bookmark retrieval
easier filename completion
added solarized colorscheme
add gundo.vim
add ir_black colorscheme
ignore .netrwhist
ir_black as a git repo
update pathogen to v1.3
set scrolloffset to 3
short messages
change something in wildmode
remember stuff across sessions

marks, registers, searches, buffer list
add vim-git plugin
alignment
indenting for js and sass
I2C test files
Fix api depending on the mod. Derp
Changed get routes to match for localization integration.
Don't attempt to send non-existent files and don't open a popup window for editing users.
Add a different exception logger for URIFormatExceptions to figure out what djphil is seeing.
Fix bug: Post data will have larger data than specified length in header.
Checking in code so I don't lose it :)
Created emacs layout, an IM layout for the speedbar window as a roster.
refactor authentication to be more robust
* changed calls to controlpage.evaluate to pass a function instead of a
  string, it's a bit cleaner
Added commandLineOptions argument to phantom.create method
Merge branches 'expand-cli' and 'master'
fix broken photo tests
re-introduce clear_logs command for clearing console logs

This patch:
* removes the log clearing code from beaker-watchdog that was added in
  commit 92dcec89
* re-adds the clear_logs command that was reverted in commit ecddbe52
* initialises the watchdog kill time after the reboot command succeeds,
  instead of when the recipe is provisioned by beakerd, to fix a race
  where the watchdog would start monitoring the console log before the
  clear_logs command had run

Bug: 835373
Change-Id: I32f68896f35ab8f7195116e3f041fce8b08936b6
Fixing up some problems that Key/Value search encountered after sqla upgrade.

Also fixed the is not query, as well as _some_ tidying up

Change-Id: I4681b9712599fb9f80afec0772af2cf1c1beb837
Bug:822426
Merge "Fixing up some problems that Key/Value search encountered after sqla upgrade." into develop
Update notes for submitted changes

* workflow-xslt: Fix jobxml_parsed variable declarations
Version bump to 0.6.0
. some typos in license and ecb
Update to the newest version of Mongoose
Add example of unique
Bump version
Overload Multi operators, add multimux & multi_or

- Todo -- negative numbers are currently being ignored, need to implement the twos' complement method
- Todo -- rewrite pad_multi so that it returns new Multi instances instead of modifying the passed-in Multi arrays
- Add overloaded &, ~, | operators in Multi
- Add multi_mux and multior_multiway
worktree in config could also be a relative path.

This was found during testing the fix for issue #201.
My submodule's worktree is a relative path like "../../../sub".
Hope this fix can handle the window path as well.
编辑和删除买家信息功能
Merge branch 'master' of https://github.com/beinuanzhang/TIVISHOP

Conflicts:
	tivishop/application/views/warehouse/warehouse.php
数据库 用户表修改.注意：得先删除原来的users表，再倒入 users.sql
Some performance improvements revolving around the
SolutionChromosome's actualSize() method.
Objective C messages: allow nested [] and protocols <>
 [ class <proto> self method ] ;
 [ [NSMutableString alloc] initWithString: @"" ];
Fixed sign up button on home page
New BKCommonLib localization update
Getshort and byte added, block sub material deprecated

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>
Add more tests.
- Add __repr__ method to CookieItem.
- Add "key" attribute to CookieItem.
raphael changes
Update OpenERP files to fit new version of the howto.
Create configuration options after loading saved settings.

This prevents saved settings from being able to overwrite the options.
Starting to implement Night Mode.
Some minor cleanup and added a note.
Use language specific variable for "Detailed Definition."
Adding initial night.css.
Handle switching into Night Mode.
Added more Night Mode styles.

Now use opacity instead of background-color for the transparent element.
Removed old -moz-linear-gradient() syntax and using the new (more convoluted) syntax.

Dropping support for Firefox older than 16.
Added queryInput class to Night Mode.
Updated queryInput and lang Night Mode styles.
Updated context menu styles for Night Mode.
Added support for the activeLang class.
More Night Mode panel styles.
Brightened up the query and language button text in Night Mode.
Added some documentation related to CSS transitions.
Moved the .fade style declaration.
Cleaned up and improved BF.make_expandable().
Only close callouts on left button clicks.
Wait longer to attach on_state_change() to the history (fixes a WebKit bug).
Removed old comment.
Double check to make sure that the database connection was established properly.
Removed the webfont from input, .callout, and .lang because Firefox always tries to load it.
A lot of miscellaneous CSS cleanup.
Improved make_expandable(), added an "expanded" class.
Display a rotating arrow on expandable elements.
erc colors update
using ace-jump-mode and expand-region
added key bindings for the above and some frequently used directories
regex security fix
Restore dfmem_extra that somehow got deleted
Merge pull request #5 from fgb/master

Restoring dfmem_extra
Initial commit of out-of-SCM development from N Kohut

Work to enable simultaneous tail, hall, and steering.
Merge remote-tracking branch 'origin/devel' into kohut_tail_devel

Conflicts:
	firmware/nbproject/Makefile-default.mk
	firmware/nbproject/Makefile-genesis.properties
	firmware/nbproject/configurations.xml
	firmware/octoroach.mcp
	firmware/source/cmd.c
	firmware/source/settings.h
	firmware/version.c
	lib/leg_ctrl.c
	lib/move_queue.c
	lib/sys_service.c
	lib/telem.c
	lib/telem.h
	python/callbackFunc.py
	python/experiment.py
	python/lib/command.py
	python/or_helpers.py
	python/shared.py
New IMU module
Merge remote-tracking branch 'kohut/tail_devel' into kohut_tail_devel
Moving IMU module to lib, adding to IDE

Currently does not build
Fixes minor error from merging

This is still untested in hardware for correct function
Removed delays in cmdSoftwareReset.

Due to previous merged fix for radio interrupt handling, this seems to not be needed anymore.
Code cleanup
Various bookeeping fixes
Heading-based steering control now works.
Correct latest verion of NKohut's code; brought into SCM just for merging.
Merge branch 'kohut_tail_correct' into kohut_tail_merging
Fixes to make project work. Details need to be worked out for taylroach operation.
changed heading steering modes, now can select decrease-type mixing or split-type mixing.
Adding tail gains setting functions to python
Adding tail gains setting functions to python
Merge remote-tracking branch 'origin/kohut_tail_merging' into kohut_tail_merging
Fixes for merge.
Removed imu.c/.h from 'source' folder, which is the wrong place for them.
Tail setup removed from python.

The tail-enabled and tail-disabled code should be moved into two different branches. There's no all-at-once solution, since tail operating requires so many changes to hardware and software.
Tentative addition of GUI library dependency to README, no GUI code yet done.
구글인증
Update changes for gcd fix.
bluenix script: no errors, no export
Fixed typo causing error in generating options
Merge branch 'master' of github.com:bmish/GuessThatFriend
Have LoadHistory() and SaveHistory() return informative errors using syscall.Errno
Add Cleanup(), with an example
Overview with example
Rename Reader() to NewReader()
Merge pull request #5 from knuesel/orig

Cleanup() and informative errors using syscall.Errno
added ntp
mac
patch up Java bits
proper uid/gid handling with attributes
ntp patch
actually use the ntp recipe, duh
updated fully-dressed use case 3 refs #2
add icons
open external links in new tabs
remove_element (by id) method
table modification helper
map and forEach overrides
map actually maps. forEach unique implementation.
milestones table, sent in save PUT request as stringified JSON array as 'milestones'
Added isUrgent highlighting and shortcut
Modified python server
debug...retrievallassessment method replace partners table to client
remove single quote..in default dao query
Always load "gui" file - it has interface customisations
Use solarized-dark on Darwin always - iTerm is capable of dealing
api to connect to the pusher channel
Don't limit command-t to 10 rows.
Merge branch 'master' of github:brianjriddle/dotfiles
re-align final to use @picked in same way we did in first version
moved connect-four under a new sub directory
starting point for final lesson of connect-four, and rough outline
updated approach for solving puzzle
beginning of finishing the lesson plan
solving for horizontal/vertical done. diagonal left as bonus
need to check continuous since the row behavior can be slightly different than columns
worked without the do, but it's good form to use
all of the lesson plan flushed out
Merge pull request #1 from brntbeer/connect-four-final

Connect four final
Config design okay'ed.
Made AJAX work for up/down vote
Updated Ajax for up/down vote
Misplaced a ! causing this not to work quite right.
removing some ~un cruft
Remove WKXXX from MiniBrowser/Efl
New message for space navigator added
New Rviz plugin look
New look of the Rviz plugin for assisted grasping
PCL registration fixes
Functional plane detection including polygon merging node
Eigen allocation fixed
Launch files and configs updated
Change the way log messages are done, add error handling for plugins
use given case for .tell acknowledgements
include storeId in private channel messages

this allows to distinguish between several subscribed stores in the private
channel message handler fn (see index.jade example)
- set up base for audiofmodbundle to play sounds read from a buffer into a stream
- continue when gstreamer bundle is reade -> change contigous block of memory to gstreamer-bundle-api-function

Signed-off-by: Robert Sommeregger <rsommeregger.mmt-m2011@fh-salzburg.ac.at>
Merge branch 'master' of https://github.com/cadet/_2RealFramework
incluindo menu principal
Incluindo a ação do menu de search
1.1.3 Build
Query predicate implementation
used package
added META
Add footer information to dublin core and ISO19110 records in simple view mode.

git-svn-id: https://geonetwork.svn.sourceforge.net/svnroot/geonetwork/trunk@9164 ff403467-3f20-0410-99e5-ff581e626a08
upgrade toolkit and add buttery animations
Optimizations for low-memory and windows 8 devices
Download from https to prevent URL mangling
Update live tile too look better on win phone 8
bump version to 2.3
Simplify binding for about page to load fast
Share via email
Fix sharing and links for holidays
Updated screenshot
Merge branch 'master' into adfree

Conflicts:
	OnThisDayApp/MainPage.xaml
	OnThisDayApp/MainPage.xaml.cs
	OnThisDayApp/OnThisDayApp.csproj
	OnThisDayApp/Properties/WMAppManifest.xml
fixed pointer error in dfilter.c
- refactored broker (topics no longer appropriate)
- added assemblies to queue-broker, queue-proxy to include dependencies
- Publisher no longer binds to local context, but relies on broker to
provide the socket
- removed port+1 logic
- fixed ListenerIT integration test
Merge branch 'master' of github.com:camsys/onebusaway-nyc
Added summary.txt to bundle building UI for OBANYC-1377. Implemented cancel functionality on all the screens of bundle building UI.
JGoogleAnalyticsTracker - initial commit before mods (exactly same as googlecode version).  Will re-integrate later.
End Screen Implemented

Fixed a lot, but added a few new bugs.
1st commit from HTC dev
Improve Popover's content view resizing
Merge branch 'master' of https://github.com/cappuccino/cappuccino
Setting the shadow style just once will do.
Fix header.
Adding random model utility method
adding in random models test
Counters done
make it brighter
test to chance socket.id
Enable Autocorrection again

Signed-off-by: Chris Brauchli <cbrauchli@gmail.com>
Mirrored autocorrection fix

_textContentView has geometry flipped, it's better to return self.
Autocorrection highlighted area position fix

and removed the red rect around highlighted word.
Merge pull request #1 from Frugghi/patch-1

Mirrored autocorrection fix
add php file examples
Finished all functions except merge/intersection/difference
initial baby log commit
merging with master
Отредактировал write_msg
Merge branch 'master' of github.com:cheshaneko/morse_char
fix Chocolatey-nuget processing Nuget output as a single multiline string. It needs to be split since it no longer comes from out-file and swallow process.Start() so it is not added to the run-nuget return
Added Admin.show_events_for_month for Admin model & tests pass.
Cleaned up the query in Admin.show_events_for_month
added route admin/calendar. also added admin_index view
Merging in Bulk Uploading changes from xt/sc, works with e-mail fields as well
Merging in from batailleye/calendar
changing Factory to FactoryGirl.create to avoid deprecation warnings
added dropdown for shift and unit_id in admin_index
Merge branch 'master' of github.com:OakCH/scheduler
dropdowns work accross pages;i.e., if you select a shift and unit in one month, they'd be selected when you pick a different month
Merging in from batailleye/calendar_admin
Merge pull request #20 from batailleye/calendar

Calendar
Merge branch 'master' of github.com:OakCH/scheduler
Merge pull request #21 from andrewnguyen/master

just merge all 0 filez
Removed created_at validation for events. Added pending messages.
Deleted created_at validation in event instead of just commenting it.
Cleaned up spec file (got rid of future iteration tests); conformed to 1 should per it statement.
A message saying 'impostor' appears if an invalid nurse_id is passed to controller
Fixed factory_girl parameters.
for calendar_controller_spec added test for index action
Merge pull request #22 from hweng/admin_spec_fix

Removed created_at validation for events.
mais codigo experimental. implementar logs individuais para cada Manager
Removed reversed arrays from root nodes to preemptively remove rotations
Updated runtimes in readme
added resource folder & image
Updates for RTMP support
Generate factories for nested packages as well.
Fix persistence to work with subforms
gentoo.org updates Wed Aug 22 05:06:45 IST 2012 update
cargador de micrositios
Added Species from XML Pokedex to the database
Added a base effect, Diverge Effect, for all diverging effects
ADDED ./Graphs/* files
ADDED ./Local_Transforms/from_group-to_users.pl file
ADDED ./Build/* files
ADDED ./Entities/Entities.csv file
ADDED ./Releases/* files
Refactor ./Entities dir
Prepping for Windows support
package cockatoo-cms
bulid httpd 2.2.21 => 2.2.22
fixed #1341 implement cc.ActionCatmullRom and its test case
fixed #1341 implement cc.ActionCatmullRom and its test case
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into iss1341_CCActionCatmullRom
Merge pull request #408 from dingpinglv/iss1341_CCActionCatmullRom

fixed #1341 implement cc.ActionCatmullRom and its test case
Add simple test for Rack middleware
MOD: avoids writing the idActiveInteractions with empty parameters. This corrects a warning message upon model load in GINsim.
Big caps on the node Gn ID
Minor plugin changes.

Changed rantext lookup dir.
Removed trailing pipe from summaries of zero-show MAL users.
maximum vehicles changed to 73
Revert "maximum vehicles changed to 73"

This reverts commit fe3be9c70c95eda70f4a145d45da120a58578744.
Added build file... bootstrapping grunt.
Replace RUBY_PLATFORM with CONFIG['host_os'] for jruby compatibility
Errors table and error message if there's a new weather description string
improve error message
Better error list
improve algorythm of weather description string translate
Status visualization and validation helpers
status update
Real status
error mailer
hipchat error notification
Exposing Handlebars's precompile method to Ruby.
add test for @fredjean's pull request
a newer lightbox2spgm
another old converter script
update to DJProject NativeSwing 1.0.2-20121008
better error message when the map cannot be initialized
Adds tests for send and redirect.
Conntrack plugin color
Adding UIView category for common views used for table views.
version bump 0.0.2 (sidekiq 2.2.1)
Minor changes to ImageAdapter
PhotoReview fixes
Revert "Renamed connection string ready to be pushed to AppHarbor"

This reverts commit 8ba52d1329a044bcc810fbcdab2059eaed2cd63a.
Updated activity_lunch_list.xml, widths now all match_parent, so EditText fields fill screen when device is rotated.
First steps toward creating an SQLiteDatabase. Created RestaurantHelper.java, stub SQLiteOpenHelper. Does next to nothing right now (gives database name and schema version).
Implemented widget_row.xml for use with ListViewsFactory.java. Dictates the layout of a row in the widget to contain restaurant names
populating Ccourse Projects
tex parameter should per texture instead of based on texture unit
change pthread_mutex_lock/unlock() to gpu_mutex_lock/unlock().
Ideally, we should wrap pthread_create/pthread_join to
gpu_thread_create/join() too
creating races and race admin
added aptana setting to .gitignore
unused

Signed-off-by: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Update lib/action_view/helpers/dynamic_form.rb

Unescaped the error_messages_for method to support html links for one of our legacy Rails app that has been upgraded to Rails 3.2.6
Fixes for Interpreter
Improved captions for reddit.com: includes just title and domain (but not votes)
Improved caption on sites like 500px.com, which use just numbers in alt text
Fixed & improved b5463c7c (taking save fname from caption): now
appends suffix only if doesn't already have it.  And fixed exception
when fname has no separators in positions 20..32.
Improved caption for featured thumbs on youtube.com
start develop v0.3.0
record fields for Route
Added database creation function
Added admin.php to contain all administrative tasks (Viewing captured emails, etc.)
Added slides and fixes to python_intro
do it better
do it better
new d-i version
Added resistance override button to debug page
go big
including field dimensions with analytics events
dart2js
Covert to vert.x test suite
Exception Test 3 - unhandled exceptions
- Update insertAsteroid method to work with new doomsdayLock field
Default to 3
Removed PPC references from OSX build
Pointing references to proper SDK
updated for() loop syntax in core.js
update for() loop syntax in prototype.js
new Constructor related tests
Ultimo commit (y)
Creando la parte de usuarios
An attempt at handling foreign characters with sphinx

Signed-off-by: David Celis <david@davidcelis.com>
added new calendar portlet that is picky about what it shows
added half finished changes to SelectBuilder
removed redundant Association attribute on Class. R120 is now part of AssociativeReference
adding generated javadoc
author and (temporary) license
got the use this badge button working
and updated gemfile for 0.1.2 too
Selection of double precision GPU
Add support for trusted hosts.
Merge remote-tracking branch 'github/master'

* github/master:
  Pruebas de parseado alternativo (II)
  Pruebas de parseado alternativo

Conflicts:
	flscriptparse.py
Fix typos.
Merge pull request #1649 from jamestyj/jamestyj-fix-typos

Fix typos
Merge branch 'master' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Make sure refs are synced before cutting release.
Merge branch 'master' into openstack-os-build
Merge pull request #767 from galthaus/pull-req-openstack-os-build-62c7fd4f2c

Last reference updates before cutting release [3/4]
Merge pull request #1254 from VictorLowther/pull-req-master-3458157901

Dumbify Ubuntu's network handling [2/5]
Merge branch 'master' into openstack-os-build
Add README for hetrogenous OS support.
Add updated submodule references for master
Merge branch 'master' into openstack-os-build
Merge pull request #1288 from VictorLowther/pull-req-openstack-os-build-17fca92dbe

Forward-port execute state changes from Fred, and add hetrogenous OS support. [6/7]
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Merge pull request #1418 from cdearborn/pull-req-release-rails3anddb-master-37bf45eb1d

Front end for network API [3/6]
Merge remote-tracking branch 'origin/release/rails3anddb/openstack-os-build' into release/rails3anddb/openstack-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Add updated submodule references for release/rails3anddb/master
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Merge pull request #1436 from galthaus/pull-req-release-rails3anddb-openstack-os-build-1b9039c60a

Fix case sensitive issue around being in the wrong place in the code [4/5]
Izpit za jult kolan.
Fix the problem with String to Integer conversion in one small place (last case)
some initial error handling in RPCService
add slashes

If the input directory doesn't contain a trailing slash the results are unexpected. Adding slashing to subdirectory references. Double-slash seems like a lesser problem compared to no slash.
Fix issue in Geomean reference and add analysis on size per test suite
Modificacao para mostrar a conta do usuario
Merge branch 'master' of https://github.com/deusdaluz/setraif-dcf

Conflicts:
	src/dcf/views/helloworld.py
Pulls the body along for 3 blocks :)
correct uglification
Added in color functionality
Files for color picker
added more helpful git commands.
added multiple time-zone display functionality.
script now handles multiple time zone display-ness via the command line.
The multiple-timezone-feature is working and meeting all requirments specified by the user stories.
Merging into develop.
adding the ratchet post, ready to push to gh-pages when the time comes :)
initial commit
Merge branch 'master' of github.com:dhruvchandna/demo_app
Adding new framework model
XD?
Merge pull request #1 from serpentes/master

- ~ -
bugfix: status_time_dcc_chat
bugfix: channel -delay
cvsimport
AUI-748 Avoid unecessary event firing
AUI-748 Regenerate
AUI-713 Improvements on the overlay recorder positions
AUI-713 Regenerate
AUI-713 Source Formatting
AUI-713 Regenerate
Added test for filling in blank month allocations
userGuide/en/chapters/14-installation-and-setup.markdown
Merge pull request #279 from jrao/LRDOCS-273

http://issues.liferay.com/browse/LRDOCS-273
fixed typo in marketplace chapter of userGuide
addresssed LRDOCS-278, removed reference to organizations.user.group.membership.enabled property that no longer exists since user groups can't be assigned to organizations; also removed organizations.assignment.auto - this property also no longer exists in LR 6.1 GA2
addressed LRDOCS-254, documented rest.proxy.url.prefixes.allowed= property
Merge branch 'LRDOCS-278' into LRDOCS-254
addressed LRDOCS-246, added lucene.replicate.write property to discussion about enabling index replication
addressed LRDOCS-232, discussed difference between permission to assign users and permission to view users; added example of User Group Manager role
updated installation instructions for Drools plugin to point to Liferay Marketplace instead of the Plugin Installer; updated references to the liferay.com community to the liferay.com site
added introduction to chapter 6, added section on user personal sites
updated section name to 'setting preferences to customize pages and applications'
addressed LRDOCS-281, wrote section on page customizations, expanded chapter summary
fixed typos, added a few more sentences about the Language portlet used in the example
added clarification that the LDAP settings in the DB get merged with the settings in portal.properties; settings in the DB take precedence in case of conflict
Merge Mark Healy's commits to change all occurrances of "control panel" to "Control Panel."
addressed LRDOCS-259, added sections on using workflow with documents and media and with collaborative applications; chapter 2 already includes an example of using workflow with web content
Merge pull request #284 from jrao/LRDOCS-246

addressed http://issues.liferay.com/browse/LRDOCS-246
Merge pull request #280 from jrao/user-guide-typo-fix

fixed typo in marketplace chapter of userGuide
Merge pull request #282 from jrao/LRDOCS-278

addresssed LRDOCS-278
Merge pull request #283 from jrao/LRDOCS-254

http://issues.liferay.com/browse/LRDOCS-254
dibbler: fix compilation
Update include/sidemenus/themes.inc.php

Comments language
the house always wins
user-nav sizes
Added Yii 1.1.10 to production environment.
Invoice now showing status as text, not integer.
Fail on bundle install
Restore Ondemand. Changing it didn't fix anything.
сделал модуль eshop_dsk приложением, чтобы он показывался в списке приложений на странице модулей
Added in first level of integration with Zoho to see if number is recognized.
Added underscore
added EG translation catalog
junit.jar and junit-4.5.jar is deleted
using UTF-8
removed comments
moved Post class to other file
removed LinearLayout import
added RSS class to use with RSS data
added INTERNET permission on manifest
updated layout
get RSS and update view
fixed problems with RSSHandler

Added suport to multiline HTML description
changed title and text to WebView

The description post is a html content, because of it I changed view type
fixed problems with encoding
removed gen/ folder
updated layout
first commit for rate_limit.py
Scrape user's pages and restaurant's pages
model validations for last elements in lists
Modify grunt dep (<=3.1.11) -> (<=3.1.12)
Jinja-windows fix, just in JinjaNode

Maybe only using os.path.relpath() in JinjaNode.render()
won't break whatever test just broke for Colin?
Modificando cliente
Updated translation for post/blacklists.

--HG--
extra : rebase_source : 9848207ba98b34b8bb6797217d3eae87fd875db8
Updated translation for post/footer.

--HG--
extra : rebase_source : 46e35efde8c5956ffc4c6bf4cff09bdbfb28a6a2
Updated translation for post/hover.

--HG--
extra : rebase_source : 99e35cc57226aa13b6e03dffa0acc1cbdc91ca2a
Added translation for post/post_atom.

--HG--
extra : rebase_source : 0c973771091f40a3b9a90b5622cf330b5acb39fb
Updated translation for post/posts.

--HG--
extra : rebase_source : 1e0bae0aa027fca015cce1426e00619a44a5dd71
Updated translation for post/search.

--HG--
extra : rebase_source : 06c9580e3dc6072b94c10ad3eaa052f4a683fdf5
Updated comment style view/post/social_meta.

--HG--
extra : rebase_source : 58e1fea8ccbf7f8c42897a2c151acbfd0a1e7763
Updated translation for post/tag_script.

--HG--
extra : rebase_source : e0d1cabb6139845ef264d5bd7058d384276889ad
Updated translation for post/tags.

--HG--
extra : rebase_source : c38089ffb5e2cfa529bbe928f0ce33508a6bb9d6
Fixed anonymous uploader display in post/browse.

Fixes issue #201.
Updated translation for post/browse.
Updated translation for post/delete.
Updated translation for post/deleted_index.
Updated translation for post/favorites.
Different ruby, different compatibility.
Translation update for locales/es.
Bitcoin yay? (before I add a db-based news).
Additional static pages.

--HG--
extra : rebase_source : a705caed5009ff8ef407c85e453c3eafe6c20268
Updated translation for post/index.
Correct way to initialize boolean config.
Xina de mela
twiddle to get travis ci to run
forwarding content-type
Merge branch 'development' of github.com:elishowk/django-poser into development
language
Merge branch 'master' of github.com:eliteguangzhou/avanah
language
Drawing of the Morse HUD now takes into account the screen size. Pending layout reconfiguration.
Orientation change will no longer dismiss HUD.
este es el primer archivo desde mi copia local
Merge branch 'master' of github.com:emepe/probando-github
changes to how classes added to GUI so SciLinux will work
Debugged MPS model compatibility check.
[AS7-4259] allow system-property runtime updates
fix rollbackOnRuntimeFailure propagation
[AS7-6133]
[AS7-6120] expression support for the jacorb subsystem
Move some new stuff
Removed unairy
Fixed ENCUESTAME-418
edit stub
56

Change-Id: I5b6213153ab6dabb6e97b46b3f3671268077e1eb
relax dep on rails to any 3.1
fix readme
Merge branch 'goggin13'

Conflicts:
	Gemfile.lock
	handlebars_wax.gemspec
improved OO design for remove() and add()
fixed up logical error in Text shape
Turkish translation has been added
MODE-1628
Fix storeTo method (configuration stored to xml contains not valid namespace "=")
change "Long" on "long"
アクセス用にパラメータを設定
Initial commit.
Flesh out a lot of stuff.
Add one page of open issues, kind of need to work on the cache.
Finish issue browser (bar caching)
Update selector to not include header.
Screw caching I have threads.
Add essentials versions to the menu.
Use responsive design
Omg creation of issues.
Make sure items don't stack wrong in [free] signs.
Allow the 'userIsNotAway' and 'userIsAway' translation messages to be empty.
We can't damage and kill, so we will just kill to make everyone happy, and the event pointless.
Revert "We can't damage and kill, so we will just kill to make everyone happy, and the event pointless."
This reverts commit 705efc60024167002b2ecf7114d5fae9dcca6c05.

Also fix kill to do the same.
Add whisper to social spy trigger list.
Revert "/me crashes ementalo's face for making the client crash."

This reverts commit 6d1e2dd10eb38ad4ad582a633f80e1e8443174c9.

And fix the original bug.
Revert "Revert "New config option 'cancel-afk-on-move' - Set to false you don't use afk." -- This should fix afk mode."
This reverts commit 95e6db679775d7ecb95ece8192b350f4c87169cb.

Another attempt at adding 'cancel-afk-on-move' toggle.
Update home count to include the bed home if set, this does not prevent people from setting a bed home if they are at max.
Home confirmation when using a bed.
Revert "Update home count..." This reverts commit 9b731cc39c450c200c2c9a5c08492b54758d1344.
On second thought, this would just lead to inconsistency....
Force 3 letters before matching players for /god /gamemode and /fly
Many changes to fix `auto-complete'
Added an explicit license, as 'public domain' has varying meanings (or no meaning) in some international contexts. No change in the code's use or lack of attribution requirements for binary distributions.
suffix say pub/sub channel to allow for many redis DBs
fixed bugs v.5.7
Added "Manual" Package Header
Removed def Package
Added Constant List for Reverse Engineering iTunesDB

I have more observations written down somewhere else.
That's not currently within my immediate reach, though.
Added Classes for Representing Media

Haven't actually coded the hard parsing, yet…
The useful attribute vars of this class will be beneficial in sorting a
human friendly iTunesDB output.(one of the few aims of this project…)
add jquery ui version support

allow only since version 1.8.24
Signed-off-by:Eric Villard <dev@eviweb.fr>
added missing sort param
Merge attributes changed
[maven-release-plugin] prepare release 1.2.2-GA
do not prompt user for password, when they opt not to provide one it is usually because keys are being used, instead
init reformat table; form; slider
datePicker, citySelect, moreThanOneValue, slider, utils (separated files)
同步会员开户
for
fro commit
for debug
Prettify language list.
Pretty good coverage now.
Remoção de imagem

This image is related to the europe puzzle.
Screenshot
Asynchronous cast.
Work only with visible nodes by default.
=Updating buttons .css
Gestion de la pagination nulle.
Oopsie :P
deleted unnecessary back up
small changes
change title on dependent wiki menu item when renaming
a wiki page
Fix for build errors with g++ 4.0.1
added cap to gemfile
changed to fisherific.com (linode) with cap deployment.  Also new 404 page.
Basic account instead of Pro account bc of limit
fixes for link indexes to get properly initialized
Importing website code
Contact us works. privacy. terms of use
Capified
tweaking capify deploy.rb. ignore database.yml
20121116LC
(REM) - Removed the previous d3d11 renderer;
(ADD) - Forgot to run add --all on the last commit so some files were
missing;
Remove TOL define, only used in one place.
test simple failure case
test simple failure case
Filter after a listBundles() action
Committer: fortime <fortime@fortime-desktop.(none)>

 On branch master

 Initial commit

 Changes to be committed:
   (use "git rm --cached <file>..." to unstage)

	new file:   dlls/winepulse.drv/mmdevdrv.c
	new file:   dlls/winepulse.drv/mmdevpulse.c
	new file:   dlls/winepulse.drv/mmdevpulse.h
Merge github.com:fortime/winepulse.drv
Backup before installing other software.
Pulling Ear added into downward sight.
Pushed latest revision 15078
Pushed latest revision 15026
Pushed latest revision 15771
Fixed generics-compilation issue for non OS X systems
More knote stuff done. It seems to work.
Builds but does nada, still.
More junk added still no window. :(
Fix plist after r303576.

Reported by QAT.

PR:		ports/171259
- Fix install inside of a clean jail by setting PHP_VERSION
  to the selected PHP port's PHP_VERSION

PR:		ports/171263
Submitted by:	bdrewery
Approved by:	Svyatoslav Lempert <svyatoslav.lempert@gmail.com> (maintainer)
Approved by:	bapt (mentor)
- Convert to new options framework
- Remove LICENSE_FILE for GPL
- Remove ABI versions for LIB_DEPENDS
- update to 3.2.2

PR:		171628
Submitted by:	maintainer, erdgeist@erdgeist.org
Deprecated a bunch a ports with no more public distfiles (thanks ehaupt's
distilator
- Update ECJ to 3.8.1.

The following changes were made in the previous commit.

- Use ECJ 3.8 instead of 4.2.  This simplifies and add more Eclipse mirrors.
They are actually the same compilers released with different Eclipse JDTs.
- Add an option to build gjdoc.
- Add an option to build with GMP, which enables java.math.BigInteger.
- Add an option to build with native JDK.  When it is turned off, ECJ or GCJ
(when WITH_GCJ is defined) is used for glibj.zip.  Note ECJ (with gij) and
GCJ can compile classpath perfectly fine on FreeBSD 9 and later but it seems
libgcj interacts badly with 7 and 8.  Need more investigation.
- Reduce unnecessary dependencies.  zip is not used when "--with-jar" is
specified.  Use pre-built ANTLR jar file, which is only used for gjdoc.
Remove JDK run-time dependency because it is only necessary to execute tools
and these tools are actually wrappers.  Now we just execute them with javavm
wrapper (or user-specified VM when JAVACMD environment variable is set).
Note you need a valid JVM to run these commands now.
- Add a patch to fix an ugly JAR updater bug.  Without this, the file name
must include "/" in it, e.g., "gjar i ./glibj.zip".


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305270 aed309b6-a8cd-e111-996c-001c23d10e55
- update to 3.2.0.9
- update pkg-descr
- trim Makefile header, while here

PR:		171677
Submitted by:	Shane Ambler <FreeBSD at Shaneware dot biz>
Approved by:	Veniamin Gvozdikov <g.veniamin at googlemail dot com> (maintainer)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305271 aed309b6-a8cd-e111-996c-001c23d10e55
- Update libee to 0.4.1
- Update libestr to 0.1.4
- Update librelp to 1.0.1
This port adds the Carrier Module to the Tryton Application Platform.

WWW: http://www.tryton.org/

PR:		171447
Submitted by:	Matthias Petermann <matthias@d2ux.net>
- Update to 0.3.3

PR:		171608
Submitted by:	Zhihao Yuan <lichray@gmail.com>
Fix typo.
Ateracao que precisava feita -- listagem de slides
add sample properties
add function for creating a new disk label
add new struct member for setting if a disk's label has
been modified since it was initially read
Added first awesome script! Thank you oenvoyage!
Added permission for actions and reports
FL-242: fork virtual/udev, remove 180
Added per-method min,max,avg calculations to [elapsedErrorChecker.py], [errorelapsed.tmpl]
Fix bug in equality comparison of cachedvalue which lead to items not updating once expired, also changing to use indexer to update regardless (no need for TryUpdate which we don't need anyways).
Wice Grid Feelings
using extendediface instead of Gaia\DB for connection remove checks
Initial commit
Merge branch 'master' of github.com:galievruslan/demo_app
SDL support and GLee now used for GL extensions!
fix shen zhouyu yeyan
just refactored a little
move the process handle api link to private method
refactor to rename val and move js process that handle navigation link on 1.x docs
just format a part of page.html
Adicionado comentários, arrumando menu.
fixes to KUbuntu script after testing
Update User Mode
Added Javadoc for Fred
Easy first level to explain the goal: get the star

User testing is very humbling.
added index.js and bumped version
fixed install command
Force gecode to install libraries in lib directory instead of lib64
Update test.md

this is an online test
deal with T = 1
changes for N=1
Register activity as page change listener on pager
Extend pager activity from GaugeListActivity
[Cookbook][validation] added class constraint paragraph
Added Unicode information about routes
new clean PR based on 2.0 branch (see PR #1203)
[Book] Update docs for new Flash API.
[Book] [Forms] Fixed getDefaultOptions() method signature
adding documentation for Size and SizeLength constraints
tweaked part titles
Merge branch '2.0'

* 2.0:
  tweaked part titles
Tip: how to add the Travis status icon in a PR
Fixing description of default behaviour of testclient on redirects, see #1254
[Component][Process] added missing word
Merge branch 'master' of git://github.com/symfony/symfony-docs
Remove parameters in the signature of the getDefaultOptions method.
Merge pull request #1239 from brikou/2_0_testing_doctrine

new clean PR based on 2.0 branch (see PR #1203)
fixed wrong reference to asset helper
Merge pull request #1222 from xavierbriand/pr-1221

[Cookbook][validation] added class constraint paragraph
[cookbook] Tweaks for #1222
Merge branch '2.0'

Conflicts:
	cookbook/testing/doctrine.rst
Merge pull request #1240 from drak/controllerflashes

[Book] Update docs for new Flash API.
Changed the string argument to the service.
Corrigido a implementacao dos testes
Corrigido questoes de Style
Removido pasta Zend
Corrigido Model Contato
Merge branch 'master' of github.com:giuseppelopes/TesteZF
Added my certificate to be included with launcher
account: photos uploading fix
Merge branch 'master' of github.com:gkrasulya/hotels-sale
Changed to H2 Mock
Remove H2 license traces - Using a H2 mock now.
Final Commit for removing unwanted files.
add histogram function to sampleTree
removed answered questions
test commit from macbook
Put actual content in readme
First draft of rotation
put waf commands the right way round
fix bug for follow return
subscribe_to_feed: stop fetching URL multiple times while subscribing, various other speedups
feedtree: prevent hideReadFeeds from working on category nodes
add built-in expiring of obsolete lockfiles
Doc: Remove instruction of adding sass-rails to Rails 3.1 projects.

It is a Rails 3.1 thing. [ci-skip]
Merge pull request #1635 from pcreux/doc-remove-sass-rails-3-1

Doc: Remove instruction of adding sass-rails to Rails 3.1 projects.
fix for issue #1604. making DeviseCreateAdminUsers migration check for migration direction before attempting to create AdminUser.
Merge pull request #1605 from garysweaver/master

Fix for Issue #1604: ActiveAdmin DeviseCreateAdminUsers migration attempts to create AdminUser on down (migrating to previous version)
remove debugging code from scripts/genstat.pl
Move the composite animation class to its own file.
Misc cleanup.

Button color refresh interface tidied up.
Added some config constants to the AppDelegate.
General cleanup of methods and docs.
Merge branch 'master' of git://github.com/gregmarra/PixelDriver into gregmarra-master

Conflicts:
	PixelDriver.xcodeproj/project.pbxproj
Merge branch 'gregmarra-master'

Closes #1
More docs and cleanup.
Calculate both a low and high res spectrum.

High res spectrum will be used for calculating pitches.
Make the project run on 10.7 machines.
10.7 support
Merge pull request #2 from gregmarra/nyan

Adds PHNyanCatBgAnimation
Nyancat foreground.
loading cards works
Now the clouds visualized by regiestered depth types are more fancy and esay to see
rails ascii
Adding Mac ignore
move to grunt wip branch. grunt now uses Gruntfile.
utils is now depreciated. switching to util.
switch to grunt options helper.
doc fix and jst now uses native _ precompiled.
README tweaks.
rebase from master and few misc things.
Updated HACKING file to new libftdi platform name.
Sugerir ponto de encontro lançando confirmação em popup, outras
modificações
Add Acer Travelmate 8481TG and Toshiba L750 in autoload list, add support for Quadro KxxxxM family
added snmp cookbook module
Bug 733896 - Together with 580381e2805c, this completely backs out b520f34d78f1 and 4f5bd60be09e. r=ehsan
搜索界面 main.py
Add svm_predict
neglected to change the config term when skipping
add entries to .gitignore.
remove unused imports.
genre selected randomly
summer is end
Removed two config entries, one plain dumb and one that noobs will not want to touch ;)
reprepro: add oneiric
Check whether exif is installed and exit if not.
client write
init
增加排序
Updated writing Jar entry to only use entry's file name without the
path.
get singular entity name from burrito message.
removed new patch folder and replaced old by new file
export from module
Add install script
Ignore *.swp
Fixes.3
Fixes.4
do not timeout by critical time, wait 3 seconds

Wait 3 seconds. because I push performance data into graphite and if it's
critical graph data is missing
example.pdf is no auto-generated and contains more documentation on how the example plota are made.
Typo
Rate listo - pinpoint con mala address
Merge branch 'master' of github.com:highapps/bicineta_app

Conflicts:
	BiciNETa/src/com/highapps/bicineta/Pinpoint.java
Merge branch 'master' of github.com:highapps/bicineta_app

Conflicts:
	BiciNETa/src/com/highapps/bicineta/Pinpoint.java
add relationships into the project
Github for windows test
update to the latest vmc gem
added parameter text (default: false) for showing new attributes value_list and value_text
Mit Bild
Bild gelöscht
With Tulips
Take out 'delete_cache' from reflected shock.
Do not limit 2nd orders.
added configscreen for lap-limit mode. actual race mode not yet implemented
changed to supoport 4 row LCD. still a bit glitchy
added code to measure 2nd slot for time mode
bug with reset button fixed
added LapLimit Racemode.
changed some constants because of different wiring. Added some comments
mejora el testing y agrega info de tests al readme
Changed an explosion constant
Fixed a bug with the way explosions are drawn
Sorted the source code into packages
fixed local audio+video browsing and playing
commit

Signed-off-by: huuhoangbk <huuhoangbk@gmail.com>
issue 938: fixed propagation of row overflow error
Fixed timestamp_max calculation in CellStoreV6
issue 923: Fixed RangeServer master initialization error reporting
Ensure single RangeServerConnection entity in MML for each connection
Accidentially added report.synctext.gz(busy), which shouldnt have been added
Merge branch 'master' of github.com:hypesystem/SliceOfPie
Move github's files into a virtual folder
Playing with rakefile
Getting app to work in couchdb
ignored bin
added jump game 2, but this code will get a TLE
Default `open` command
Handling MIX messages as proplists.